Merged server.conf.d and lodelsites_conf.d for lodelsites

Now both __loader__ and lodelsites contexts are using the same configuration
files and the same confspecs.

lodel/bootstrap.py

@@ -20,6 +20,9 @@ from lodel.context import LodelContext
 #First item is for monosite the second for multisite
 #First item for multisite is server conf the second the lodelsites instance
 #conf
+#
+#@note obsolete ! We are preparing a merge of server_conf.d and 
+#lodelsites.conf.d
 CONFS_DIRNAMES = [
     'conf.d',
     ('server_conf.d', 'lodelsites.conf.d')]
@@ -42,12 +45,14 @@ def _context_initialisation():
 def _get_confdir(ctx_type):
     if _monosite_test():
         return CONFS_DIRNAMES[0]
-    elif ctx_type == '__loader__':
-        return CONFS_DIRNAMES[1][0]
-    elif ctx_type == 'lodelsites':
-        return CONFS_DIRNAMES[1][1]
-    raise ValueError("ctx_type is not one of '__loader__' nor 'lodelsites' \
-authorized values")
+    return CONFS_DIRNAMES[1][1]
+
+    #elif ctx_type == '__loader__':
+    #    return CONFS_DIRNAMES[1][0]
+    #elif ctx_type == 'lodelsites':
+    #    return CONFS_DIRNAMES[1][1]
+    #raise ValueError("ctx_type is not one of '__loader__' nor 'lodelsites' \
+    #authorized values")
 
 ##@brief Return confspec associated with current context & context type
 #@param ctx_type str 
@@ -90,8 +95,11 @@ MONOSITE instance")
         'lodel.settings.settings': [('Settings', 'settings_loader')],
         'lodel.plugins.multisite.confspecs': 'multisite_confspecs'})
     
-    settings_loader(confdir, custom_confspecs)
-    del(globals()['settings'])
+    if ctx_type is not None:
+        settings_loader(confdir, custom_confspecs, True) #Append specs
+    else:
+        settings_loader(confdir, custom_confspecs)
+    del(globals()['settings_loader'])
 
     LodelContext.expose_modules(globals(), {
         'lodel.settings': ['Settings']})

lodel/plugins/multisite/confspecs.py

@@ -2,14 +2,12 @@ from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
     'lodel.validator.validator': ['Validator']})
 
-#Define a minimal confspec used by multisite loader
+#Define a minimal confspec used by multisite loader and by lodelsites
+#instance
 LODEL2_CONFSPECS = {
-    'lodel2': {
-        'debug': (True, Validator('bool')),
-    },
     'lodel2.lodelsites': {
-        'name': (None,
-            Validator('string', none_is_valid = False)), #Bad validator
+        #'name': (None,
+        #    Validator('string', none_is_valid = False)), #replaced by lodel2.name
         'lodelsites_emfile': (None,
             Validator('string', none_is_valid = False)), #Bad validator
         'lodelsites_emtranslator': ('picklefile',
@@ -19,20 +17,4 @@ LODEL2_CONFSPECS = {
         'sites_emtranslator': ('picklefile',
             Validator('string', none_is_valid = False)), #Bad validator
     },
-    'lodel2.logging.*' : {
-        'level': (  'ERROR',
-                    Validator('loglevel')),
-        'context': (    False,
-                        Validator('bool')),
-        'filename': (   None,
-                        Validator('errfile', none_is_valid = True)),
-        'backupcount': (    10,
-                            Validator('int', none_is_valid = False)),
-        'maxbytes': (   1024*10,
-                        Validator('int', none_is_valid = False)),
-    },
-    'lodel2.datasources.*': {
-        'read_only': (False, Validator('bool')),
-        'identifier': ( None, Validator('string')),
-    }
 }

lodel/settings/settings.py

@@ -82,17 +82,25 @@ class Settings(object, metaclass=MetaSettings):
     #  @brief Stores the singleton instance
     instance = None
 
-    #  @brief Instanciate the Settings singleton
-    # @param conf_dir str : The configuration directory
+    ##@brief Instanciate the Settings singleton
+    #@param conf_dir str : The configuration directory
     #@param custom_confspecs None | dict : if given overwrite default lodel2
     # confspecs
-    def __init__(self, conf_dir, custom_confspecs=None):
+    #@param append bool : if true do not replace LODEL2CONFSPECS by
+    #custom_confspecs, append them instead
+    #
+    #@todo append param and __custom_specs_append attributes are quick
+    #workarounds in order to be able to specialise LODEL2_CONF_SPECS for a 
+    #multisite lodelsite. This should be done using the standard confspecs
+    #mechanism available using plugins
+    def __init__(self, conf_dir, custom_confspecs=None, append = False):
         self.singleton_assert()  # check that it is the only instance
         Settings.instance = self
         #  @brief Configuration specification
         #
         # Initialized by Settings.__bootstrap() method
-        self.__conf_specs = custom_confspecs
+        self.__conf_specs = custom_confspecs if not append else None
+        self.__conf_specs_append = custom_confspecs if append else None
         #  @brief Stores the configurations in namedtuple tree
         self.__confs = None
         self.__conf_dir = conf_dir
@@ -181,6 +189,8 @@ class Settings(object, metaclass=MetaSettings):
         Plugin.start(plugin_list)
         # Fetching conf specs from plugins
         specs = [lodel2_specs]
+        if self.__conf_specs_append is not None:
+            specs.append(self.__conf_specs_append)
         errors = list()
         for plugin_name in plugin_list:
             try:

lodel/validator/validator.py

@@ -405,7 +405,7 @@ Validator.register_validator(
 #   Lodel 2 configuration specification
 #
 
-# @brief Append a piece of confspec
+##@brief Append a piece of confspec
 #@note orig is modified during the process
 #@param orig dict : the confspec to update
 #@param section str : section name
@@ -413,8 +413,6 @@ Validator.register_validator(
 #@param validator Validator : the validator to use to check this configuration key's value
 #@param default
 #@return new confspec
-
-
 def confspec_append(orig, section, key, validator, default):
     if section not in orig:
         orig[section] = dict()

progs/slim/Makefile.am

@@ -22,8 +22,6 @@ multisite_install_model__DATA = multisite_install_model/Makefile \
 
 multisite_lodelsites_conf_dir = $(multisite_install_model_dir)/lodelsites.conf.d
 multisite_lodelsites_conf__DATA = multisite_install_model/lodelsites.conf.d/lodel2.ini
-multisite_server_conf_dir = $(multisite_install_model_dir)/server_conf.d
-multisite_server_conf__DATA = multisite_install_model/server_conf.d/lodel2.ini
 
 
 slim_conf_model_dir = $(install_model_dir)/conf.d/

progs/slim/multisite_install_model/lodelsites.conf.d/lodel2.ini

@@ -14,6 +14,10 @@ emfile = editorial_model.pickle
 #emtranslator = externaly_handled
 dyncode = leapi_dyncode.py
 
+[lodel2.lodelsites]
+sites_emfile = sites_em.pickle
+lodelsites_emfile = editorial_model.pickle
+
 [lodel2.datasource.lodelsite_datasource.default]
 db_datasource = mongo
 

progs/slim/multisite_install_model/server_conf.d/lodel2.ini

@@ -1,22 +0,0 @@
-[lodel2]
-debug = False
-datasource_connectors = mongodb_datasource lodelsite_datasource
-session_handler = filesystem_session
-
-[lodel2.datasource.lodelsite_datasource.default]
-db_datasource = mongo
-
-[lodel2.datasources.default]
-identifier = dummy_datasource.default
-
-[lodel2.datasources.dummy2]
-identifier = dummy_datasource.default
-
-[lodel2.datasource.dummy_datasource.default]
-dummy =
-
-[lodel2.logging.default]
-context = True
-filename = -
-level = DEBUG
-