RuntimeConfiguration

Author: albu-diku

mig/shared/conf.py

@@ -32,6 +32,7 @@
 import os
 import sys
 
+from mig.shared.configuration import RuntimeConfiguration
 from mig.shared.defaults import MIG_ENV
 from mig.shared.fileio import unpickle
 
@@ -42,7 +43,6 @@ def get_configuration_object(config_file=None, skip_log=False,
     and disable_auth_log arguments are passed on to allow skipping the default
     log initialization and disabling auth log for unit tests.
     """
-    from mig.shared.configuration import Configuration
     if config_file:
         _config_file = config_file
     elif os.environ.get('MIG_CONF', None):
@@ -63,7 +63,7 @@ def get_configuration_object(config_file=None, skip_log=False,
         skip_log = True
         disable_auth_log = True
 
-    configuration = Configuration(_config_file, False, skip_log,
+    configuration = RuntimeConfiguration(_config_file, False, skip_log,
                                   disable_auth_log)
     return configuration
 

mig/shared/configuration.py

@@ -759,7 +759,6 @@ def __init__(self, config_file, verbose=False, skip_log=False,
         self.default_page = None
         self.auth_logger_obj = None
         self.gdp_logger_obj = None
-        self._context = None
 
         configuration_options = copy.deepcopy(_CONFIGURATION_DEFAULTS)
 
@@ -771,26 +770,6 @@ def __init__(self, config_file, verbose=False, skip_log=False,
                                disable_auth_log=disable_auth_log,
                                _config_file=config_file)
 
-    def context(self, namespace=None):
-        """Retrieve the context or a previously registered namespace.
-        """
-
-        if self._context is None:
-            self._context = {}
-        if namespace is None:
-            return self._context
-        # allow the KeyError to escape if the registered namespace is missing
-        return self._context[namespace]
-
-    def context_set(self, value, namespace=None):
-        """Attach a value as named namespace within the active congifuration.
-        """
-        assert namespace is not None
-
-        context = self.context()
-        context[namespace] = value
-        return value
-
     def reload_config(self, verbose, skip_log=False, disable_auth_log=False,
                       _config_file=None):
         """Re-read and parse configuration file. Optional skip_log arg
@@ -2872,6 +2851,47 @@ def parse_peers(self, peerfile):
         return peers_dict
 
 
+class RuntimeConfiguration(Configuration):
+    """A more specific version of the Configuration which additionally supports
+    the notion of a context.
+
+    Contextual information that is relevant to the duration of a request is
+    required in certain cases e.g. to support templating. Given Configuration
+    objects are threaded into and throough almost all the necessary codepaths
+    to make this information available, they are an attractive place to put
+    this - but a Configuration is currently loaded from static per-site data.
+
+    Resolv this ambiguity with this subclass - a raw Confioguration will
+    continute to represent the static data while a specialised but entirely
+    compatible object is handed to request processing codepaths.
+    """
+
+    def __init__(self, config_file, verbose=False, skip_log=False,
+                 disable_auth_log=False):
+        super().__init__(config_file, verbose, skip_log, disable_auth_log)
+        self._context = None
+
+    def context(self, namespace=None):
+        """Retrieve the context or a previously registered namespace.
+        """
+
+        if self._context is None:
+            self._context = {}
+        if namespace is None:
+            return self._context
+        # allow the KeyError to escape if the registered namespace is missing
+        return self._context[namespace]
+
+    def context_set(self, value, namespace=None):
+        """Attach a value as named namespace within the active congifuration.
+        """
+        assert namespace is not None
+
+        context = self.context()
+        context[namespace] = value
+        return value
+
+
 if '__main__' == __name__:
     conf = Configuration(os.path.expanduser('~/mig/server/MiGserver.conf'),
                          True)