core (logs): use tools.config to handle sat.conf
This commit is contained in:
parent
304b1eb34b
commit
864520086a
1 changed files with 3 additions and 7 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue