comparison src/core/log_config.py @ 1941:befdcfc55569

core (logs): use tools.config to handle sat.conf
author Goffi <goffi@goffi.org>
date Mon, 18 Apr 2016 18:33:59 +0200
parents 3fdacba9da68
children 7f053e1f0b67
comparison
equal deleted inserted replaced
1940:3fdacba9da68 1941:befdcfc55569
396 """ 396 """
397 if const is not None: 397 if const is not None:
398 global C 398 global C
399 C = const 399 C = const
400 log.C = const 400 log.C = const
401 import ConfigParser 401 from sat.tools import config
402 import os 402 import os
403 log_conf = {} 403 log_conf = {}
404 config = ConfigParser.SafeConfigParser() 404 sat_conf = config.parseMainConf()
405 config.read(C.CONFIG_FILES)
406 for opt_name, opt_default in C.LOG_OPTIONS(): 405 for opt_name, opt_default in C.LOG_OPTIONS():
407 try: 406 try:
408 log_conf[opt_name] = os.environ[''.join((C.ENV_PREFIX, C.LOG_OPT_PREFIX.upper(), opt_name.upper()))] 407 log_conf[opt_name] = os.environ[''.join((C.ENV_PREFIX, C.LOG_OPT_PREFIX.upper(), opt_name.upper()))]
409 except KeyError: 408 except KeyError:
410 try: 409 log_conf[opt_name] = config.getConfig(sat_conf, C.LOG_OPT_SECTION, C.LOG_OPT_PREFIX + opt_name, opt_default)
411 log_conf[opt_name] = config.get(C.LOG_OPT_SECTION, C.LOG_OPT_PREFIX + opt_name)
412 except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
413 log_conf[opt_name] = opt_default
414 410
415 _parseOptions(log_conf) 411 _parseOptions(log_conf)
416 configure(backend, backend_data=backend_data, **log_conf) 412 configure(backend, backend_data=backend_data, **log_conf)