Merge pull request #182 from jumpserver/dev

[Update] 修改配置文件判断

coco/app.py

@@ -38,6 +38,7 @@ class Coco:
         self.replay_recorder_class = None
         self.command_recorder_class = None
         self._task_handler = None
+        self.first_load_extra_conf = True
 
     @property
     def sshd(self):
@@ -57,17 +58,18 @@ class Coco:
             self._task_handler = TaskHandler()
         return self._task_handler
 
-    @staticmethod
     @ignore_error
-    def load_extra_conf_from_server():
+    def load_extra_conf_from_server(self):
         configs = app_service.load_config_from_server()
         config.update(configs)
 
         tmp = copy.deepcopy(configs)
         tmp['HOST_KEY'] = tmp.get('HOST_KEY', '')[32:50] + '...'
-        logger.debug("Loading config from server: {}".format(
-            json.dumps(tmp)
-        ))
+        if self.first_load_extra_conf:
+            logger.debug("Loading config from server: {}".format(
+                json.dumps(tmp)
+            ))
+            self.first_load_extra_conf = False
 
     def keep_load_extra_conf(self):
         def func():

coco/conf.py

@@ -298,6 +298,10 @@ class Config(dict):
         if value is not None:
             if value.isdigit():
                 value = int(value)
+            elif value.lower() == 'false':
+                value = False
+            elif value.lower() == 'true':
+                value = True
             return value
         return self.defaults.get(item)