Merge "Fix doble writes of logging messges to STDERR when using stderr"

This commit is contained in:
Zuul 2018-12-05 09:30:59 +00:00 committed by Gerrit Code Review
commit 5a704f3327
1 changed files with 0 additions and 15 deletions

View File

@ -69,30 +69,17 @@ def init_tobiko_config(default_config_dirs=None, product_name='tobiko',
# Register configuration options
conf = cfg.ConfigOpts()
log.register_options(conf)
log.register_options = dummy_log_register_options
register_tobiko_options(conf=conf)
# Initialize tobiko configuration object
conf.use_stderr = True
conf(args=[], default_config_dirs=default_config_dirs)
CONF.set_source('tobiko', conf)
# setup final configuration
log.setup(conf=conf, product_name=product_name, version=version)
log.setup = dummy_log_setup
setup_tobiko_config()
def dummy_log_register_options(conf):
# pylint: disable=unused-argument
pass
def dummy_log_setup(conf, product_name, version=None):
# pylint: disable=unused-argument
pass
def register_tobiko_options(conf):
for module_name in CONFIG_MODULES:
module = importlib.import_module(module_name)
@ -106,8 +93,6 @@ def setup_tobiko_config():
if hasattr(module, 'setup_tobiko_config'):
module.setup_tobiko_config()
log.setup = dummy_log_setup
def init_tempest_config():
try: