Updates the multisite loader to enable loader settings & logger

lodel/plugins/multisite/loader.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import os
 import os.path
+import warnings
 LODEL2_INSTANCES_DIR = '.'
+EXCLUDE_DIR = {'conf.d'}
 
 try:
     from lodel.context import LodelContext
@@ -11,9 +13,20 @@ except ImportError:
     from lodel.context import LodelContext
 
 LodelContext.init(LodelContext.MULTISITE)
+LodelContext.set(None) #Loading context creation
+#Multisite instance settings loading
+CONFDIR = os.path.join(os.getcwd(), 'conf.d')
+if not os.path.isdir(CONFDIR):
+    warnings.warn('%s do not exists, default settings used' % CONFDIR)
+LodelContext.expose_modules(globals(), {
+    'lodel.settings.settings': [('Settings', 'settings')],
+    'lodel.plugins.multisite.confspecs': 'multisite_confspecs'})
+if not settings.started():
+    settings('./conf.d', multisite_confspecs.LODEL2_CONFSPECS)
+
 lodelsites_list = [ os.path.realpath(os.path.join(LODEL2_INSTANCES_DIR,sitename)) 
     for sitename in os.listdir(LODEL2_INSTANCES_DIR)
-    if os.path.isdir(sitename)]
+    if os.path.isdir(sitename) and sitename not in EXCLUDE_DIR]
 for lodelsite_path in lodelsites_list:
     ctx_name = LodelContext.from_path(lodelsite_path)
     #Switch to new context
@@ -23,7 +36,7 @@ for lodelsite_path in lodelsites_list:
     LodelContext.expose_modules(globals(), {
         'lodel.settings.settings': [('Settings', 'settings')]})
     if not settings.started():
-        settings('conf.d')
+        settings('./conf.d')
     LodelContext.expose_modules(globals(), {'lodel.settings': ['Settings']})
 
     # Loading hooks & plugins
@@ -48,6 +61,7 @@ for lodelsite_path in lodelsites_list:
     #switch back to loader context
     LodelContext.set(None)
 
-import lodel.plugins.multisite.main as main
+LodelContext.expose_modules(
+    globals(), {'lodel.plugins.multisite.main': 'main'})
 main.main_loop()