From 864520086ad509d2fc07176eb3f392005f90267c Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 18 Apr 2016 18:33:59 +0200 Subject: [PATCH] core (logs): use tools.config to handle sat.conf --- src/core/log_config.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/log_config.py b/src/core/log_config.py index 87fd22c5..fa8e23fc 100644 --- a/src/core/log_config.py +++ b/src/core/log_config.py @@ -398,19 +398,15 @@ def satConfigure(backend=C.LOG_BACKEND_STANDARD, const=None, backend_data=None): global C C = const log.C = const - import ConfigParser + from sat.tools import config import os log_conf = {} - config = ConfigParser.SafeConfigParser() - config.read(C.CONFIG_FILES) + sat_conf = config.parseMainConf() for opt_name, opt_default in C.LOG_OPTIONS(): try: log_conf[opt_name] = os.environ[''.join((C.ENV_PREFIX, C.LOG_OPT_PREFIX.upper(), opt_name.upper()))] except KeyError: - try: - log_conf[opt_name] = config.get(C.LOG_OPT_SECTION, C.LOG_OPT_PREFIX + opt_name) - except (ConfigParser.NoOptionError, ConfigParser.NoSectionError): - log_conf[opt_name] = opt_default + log_conf[opt_name] = config.getConfig(sat_conf, C.LOG_OPT_SECTION, C.LOG_OPT_PREFIX + opt_name, opt_default) _parseOptions(log_conf) configure(backend, backend_data=backend_data, **log_conf)