openstack/deb-murano
Code Issues Proposed changes

Merge "Fix logging_setup call"

Browse Source
This commit is contained in:
Jenkins
2016-01-15 15:36:39 +00:00
committed by Gerrit Code Review
parent f350a6cf7f 7c33bc5d27
commit 502d44b062
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
murano/cmd/test_runner.py
View File

@@ -311,6 +311,7 @@ def main():
default_config_files = [murano_conf] default_config_files = [murano_conf]
sys.argv = [sys.argv[0]] sys.argv = [sys.argv[0]]
config.parse_args(default_config_files=default_config_files) config.parse_args(default_config_files=default_config_files)
logging.setup(CONF, 'murano')
except RuntimeError as e: except RuntimeError as e:
LOG.exception(_LE("Failed to initialize murano-test-runner: %s") % e) LOG.exception(_LE("Failed to initialize murano-test-runner: %s") % e)
sys.exit("ERROR: %s" % e) sys.exit("ERROR: %s" % e)

1
murano/common/config.py
View File

@@ -284,7 +284,6 @@ CONF.register_opts(glance_opts, group='glance')
def parse_args(args=None, usage=None, default_config_files=None): def parse_args(args=None, usage=None, default_config_files=None):
logging.register_options(CONF) logging.register_options(CONF)
logging.setup(CONF, 'murano')
CONF(args=args, CONF(args=args,
project='murano', project='murano',
version=version.version_string, version=version.version_string,