Fixing import in logger plugins & datasource_plugin

lodel/logger.py

@@ -19,11 +19,14 @@ logger = logging.getLogger()
 ##@brief Module initialisation from settings
 #@return True if inited else False
 def __init_from_settings():
+    from lodel.context import LodelContext
     try:
-        from lodel.settings import Settings
+        LodelContext.expose_modules(globals(), {
+            'lodel.settings': ['Settings']})
     except Exception:
         return False
-    from lodel.settings.settings import Settings as Lodel2Settings
+    LodelContext.expose_modules(globals(), {
+        'lodel.settings.settings': [('Settings', 'Lodel2Settings')]})
     if not Lodel2Settings.started():
         return False
     # capture warning disabled, because the custom format raises error (unable

lodel/plugin/datasource_plugin.py

@@ -96,7 +96,7 @@ class DatasourcePlugin(Plugin):
     _plist_confspecs = {
         'section': 'lodel2',
         'key': 'datasource_connectors',
-        'default': None,
+        'default': 'dummy_datasource',
         'validator': SettingValidator(
             'custom_list', none_is_valid = False,
             validator_name = 'plugin', validator_kwargs = {
@@ -165,7 +165,8 @@ migration handler !!!")
     #false
     @staticmethod
     def plugin_name(ds_name, ro):
-        from lodel.settings import Settings
+        LodelContext.expose_modules(globals(), {
+            'lodel.settings': ['Settings']})
         # fetching connection identifier given datasource name
         try:
             ds_identifier = getattr(Settings.datasources, ds_name)
@@ -201,7 +202,8 @@ DS_PLUGIN_NAME.DS_INSTANCE_NAME. But got %s" % ds_identifier)
     #@throw NameError if a datasource plugin or instance cannot be found
     @staticmethod
     def _get_ds_connection_conf(ds_identifier,ds_plugin_name):
-        from lodel.settings import Settings
+        LodelContext.expose_modules(globals(), {
+            'lodel.settings': ['Settings']})
         if ds_plugin_name not in Settings.datasource._fields:
             msg = "Unknown or unconfigured datasource plugin %s"
             msg %= ds_plugin_name

lodel/plugin/plugins.py

@@ -843,6 +843,9 @@ file : '%s'. Running discover again..." % DISCOVER_CACHE_FILENAME)
     #@return A dict with plugin_name as key and {'path':..., 'version':...} as value
     @classmethod
     def _discover(cls, path):
+        #Ensure plugins symlink creation
+        LodelContext.expose_modules(globals(), {
+            'lodel.plugins': 'plugins'})
         res = []
         to_explore = [path]
         while len(to_explore) > 0: