Bugfixes in context and webui in order to test multisite

Regression may have been introduced about MONOSITE mode

lodel/context.py

@@ -97,6 +97,9 @@ class LodelContext(object):
     _type = None
     ##@brief Stores the contexts
     _contexts = None
+
+    ##@brief Flag indicating if the classe is initialized
+    __initialized = False
     
     ##@brief Create a new context
     #@see LodelContext.new()
@@ -266,6 +269,11 @@ initialize it anymore")
         else:
             #Add a single context with no site_id
             cls._contexts = cls._current = cls(None)
+        cls.__initialized = True
+
+    @classmethod
+    def is_initialized(cls):
+        return cls.__initialized
     
     ##@brief Return the directory of the package of the current loaded context
     @classmethod
@@ -305,12 +313,13 @@ key '%s'" % alias)
     ##@brief Create a context from a path and returns the context name
     #@param path str : the path from which we extract a sitename
     #@return the site identifier
+    @classmethod
     def from_path(cls, path):
         if cls._type != cls.MULTISITE:
             raise ContextError("Cannot create a context from a path in \
 MONOSITE mode")
         site_id = os.path.basename(path.strip('/'))
-        if not self.validate_identifier(site_id):
+        if not cls.validate_identifier(site_id):
             raise ContextError(
                 "Unable to create a context named '%s'" % site_id)
         cls.new(site_id)

lodel/plugins/multisite/loader.py

@@ -6,17 +6,22 @@ LODEL2_INSTANCES_DIR = '.'
 try:
     from lodel.context import LodelContext
 except ImportError:
-    LODEL_BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    LODEL_BASE_DIR = os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
     from lodel.context import LodelContext
 
-lodelsites_list = [sitename for sitename in os.listdir(LODEL2_INSTANCES_DIR) if os.path.isdir(sitename)]
+LodelContext.init(LodelContext.MULTISITE)
+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)]
 for lodelsite_path in lodelsites_list:
     ctx_name = LodelContext.from_path(lodelsite_path)
     #Switch to new context
     LodelContext.set(ctx_name)
-    os.cwd(lodelsite_path)
+    os.chdir(lodelsite_path)
     # Loading settings
-    LodelContext.expose_modules(globals(), {'lodel.settings.settings': [('Settings', 'settings')]})
+    LodelContext.expose_modules(globals(), {
+        'lodel.settings.settings': [('Settings', 'settings')]})
     if not settings.started():
         settings('conf.d')
     LodelContext.expose_modules(globals(), {'lodel.settings': ['Settings']})

lodel/plugins/multisite/main.py

@@ -145,18 +145,10 @@ def wsgi_router(env, start_response):
         print(e)
         return http_error(env, start_response, '404 Not found',
             "No site named '%s'" % site_id)
-    #
-    #   Here we have to put the code that run the request
-    #
-    
-    #Testing purpose
-    rep = "Woot '%s'" % site_id
-    print(rep)
-    start_response('200 ok', [('Content-type', 'text/plain; charset=utf-8')])
-    return [rep.encode('utf-8')]
-
-    #mp.Process(target=foo, args=(env,start_response))
-    return child_proc(env, start_response)
+    #Calling webui
+    LodelContext.expose_modules(globals(), {
+        'lodel.plugins.webui.run': ['application']})
+    return application(env, start_response)
 
 ##@brief Starts the server until a SIGINT is received
 def main_loop():

lodel/plugins/webui/run.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import loader # Lodel2 loader
+from lodel.context import LodelContext
+
+if not LodelContext.is_initialized():
+    import loader # Lodel2 loader
 
 import os
 import hashlib
@@ -7,7 +10,6 @@ import time
 
 from werkzeug.wrappers import Response
 
-from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
     'lodel.settings': ['Settings'],
     'lodel.auth.exceptions': ['ClientError', 'ClientAuthenticationFailure',