diff options
author | MaZderMind <git@mazdermind.de> | 2015-09-05 20:48:01 +0200 |
---|---|---|
committer | MaZderMind <git@mazdermind.de> | 2015-09-05 20:48:01 +0200 |
commit | 65356fd083f31cc6956516a7e8fc04896c9f5ffc (patch) | |
tree | e3a645f6459dd4a3fae8497867200062025f762b /voctogui/lib/config.py | |
parent | 5e449400a6e7747a2135aa81dedc71c46a1e3664 (diff) |
implement config fetching and switch to async mode
Diffstat (limited to 'voctogui/lib/config.py')
-rw-r--r-- | voctogui/lib/config.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/voctogui/lib/config.py b/voctogui/lib/config.py index b18acfb..27dd9c7 100644 --- a/voctogui/lib/config.py +++ b/voctogui/lib/config.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 import logging +import json import os.path from configparser import SafeConfigParser from lib.args import Args @@ -10,13 +11,17 @@ __all__ = ['Config'] def getlist(self, section, option): return [x.strip() for x in self.get(section, option).split(',')] -def fetchRemoteConfig(self): +def fetchServerConfig(self): log = logging.getLogger('Config') log.info("reading server-config %s", Connection) - Connection.ask('config') + + server_config = Connection.fetchServerConfig() + + log.info("merging server-config %s", server_config) + self.read_dict(server_config) SafeConfigParser.getlist = getlist -SafeConfigParser.fetchRemoteConfig = fetchRemoteConfig +SafeConfigParser.fetchServerConfig = fetchServerConfig files = [ os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'), |