Merge pull request #145 from jumpserver/dev

Dev

Author: ibuler

coco/app.py

@@ -56,15 +56,25 @@ def task_handler(self):
         return self._task_handler
 
     @staticmethod
+    @ignore_error
     def load_extra_conf_from_server():
         configs = app_service.load_config_from_server()
         logger.debug("Loading config from server: {}".format(
             json.dumps(configs)
         ))
         config.update(configs)
 
+    def keep_load_extra_conf(self):
+        def func():
+            while True:
+                self.load_extra_conf_from_server()
+                time.sleep(60*10)
+        thread = threading.Thread(target=func)
+        thread.start()
+
     def bootstrap(self):
         self.load_extra_conf_from_server()
+        self.keep_load_extra_conf()
         self.keep_heartbeat()
         self.monitor_sessions()
         self.monitor_sessions_replay()

coco/config.py

@@ -92,8 +92,9 @@ class Config(dict):
     """
 
     def __init__(self, root_path, defaults=None):
-        dict.__init__(self, defaults or {})
+        self.defaults = defaults or {}
         self.root_path = root_path
+        super().__init__({})
 
     def from_envvar(self, variable_name, silent=False):
         """Loads a configuration from an environment variable pointing to
@@ -269,6 +270,21 @@ def get_namespace(self, namespace, lowercase=True, trim_namespace=True):
             rv[key] = v
         return rv
 
+    def __getitem__(self, item):
+        try:
+            value = super().__getitem__(item)
+        except KeyError:
+            value = None
+        if value is not None:
+            return value
+        value = os.environ.get(item, None)
+        if value is not None:
+            return value
+        return self.defaults.get(item)
+
+    def __getattr__(self, item):
+        return self.__getitem__(item)
+
     def __repr__(self):
         return '<%s %s>' % (self.__class__.__name__, dict.__repr__(self))
 
@@ -302,6 +318,7 @@ def __repr__(self):
     'REPLAY_STORAGE': {'TYPE': 'server'},
     'LANGUAGE_CODE': 'zh',
     'SECURITY_MAX_IDLE_TIME': 60,
+    'ASSET_LIST_PAGE_SIZE': 'auto',
 }
 
 config = Config(root_path, default_config)