Commit d0238e3f authored by ibuler's avatar ibuler

[Update] 修改配置文件判断

parent 35b5361b
...@@ -38,6 +38,7 @@ class Coco: ...@@ -38,6 +38,7 @@ class Coco:
self.replay_recorder_class = None self.replay_recorder_class = None
self.command_recorder_class = None self.command_recorder_class = None
self._task_handler = None self._task_handler = None
self.first_load_extra_conf = True
@property @property
def sshd(self): def sshd(self):
...@@ -57,17 +58,18 @@ class Coco: ...@@ -57,17 +58,18 @@ class Coco:
self._task_handler = TaskHandler() self._task_handler = TaskHandler()
return self._task_handler return self._task_handler
@staticmethod
@ignore_error @ignore_error
def load_extra_conf_from_server(): def load_extra_conf_from_server(self):
configs = app_service.load_config_from_server() configs = app_service.load_config_from_server()
config.update(configs) config.update(configs)
tmp = copy.deepcopy(configs) tmp = copy.deepcopy(configs)
tmp['HOST_KEY'] = tmp.get('HOST_KEY', '')[32:50] + '...' tmp['HOST_KEY'] = tmp.get('HOST_KEY', '')[32:50] + '...'
logger.debug("Loading config from server: {}".format( if self.first_load_extra_conf:
json.dumps(tmp) logger.debug("Loading config from server: {}".format(
)) json.dumps(tmp)
))
self.first_load_extra_conf = False
def keep_load_extra_conf(self): def keep_load_extra_conf(self):
def func(): def func():
......
...@@ -298,6 +298,10 @@ class Config(dict): ...@@ -298,6 +298,10 @@ class Config(dict):
if value is not None: if value is not None:
if value.isdigit(): if value.isdigit():
value = int(value) value = int(value)
elif value.lower() == 'false':
value = False
elif value.lower() == 'true':
value = True
return value return value
return self.defaults.get(item) return self.defaults.get(item)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment