From 54d23005689a2ab88dacb6e347a5b8276e50aebc Mon Sep 17 00:00:00 2001 From: Ronald Bradford Date: Fri, 13 Nov 2015 16:27:07 -0500 Subject: [PATCH] Remove duplicated oslo.log configuration setup Simplified the definition of Nova specific log levels by extending the oslo.log standard levels used of all projects. This olso.log default includes all existing values including suds=INFO. * Removed logging context format as this matches oslo.log default. * Reordered log initiation calls to match documented order. See http://docs.openstack.org/developer/oslo.log/usage.html Change-Id: Ibb4bf8b50419a578db49953e2fc69f45c5e3edb3 --- nova/cmd/manage.py | 6 ++++-- nova/config.py | 21 +++++---------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 1b38871360..43f192fb64 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -98,7 +98,7 @@ CONF.import_opt('public_interface', 'nova.network.linux_net') QUOTAS = quota.QUOTAS -_DEFAULT_LOG_LEVELS = config._DEFAULT_LOG_LEVELS + ['oslo_db=INFO'] +_EXTRA_DEFAULT_LOG_LEVELS = ['oslo_db=INFO'] # Decorators for actions @@ -1439,7 +1439,9 @@ def main(): CONF.register_cli_opt(category_opt) try: config.parse_args(sys.argv) - logging.set_defaults(default_log_levels=_DEFAULT_LOG_LEVELS) + logging.set_defaults( + default_log_levels=logging.get_default_log_levels() + + _EXTRA_DEFAULT_LOG_LEVELS) logging.setup(CONF, "nova") except cfg.ConfigFilesNotFoundError: cfgfile = CONF.config_file[-1] if CONF.config_file else None diff --git a/nova/config.py b/nova/config.py index 7c36064759..ba544781bc 100644 --- a/nova/config.py +++ b/nova/config.py @@ -31,27 +31,16 @@ CONF = cfg.CONF _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('nova.sqlite') -# NOTE(mikal): suds is used by the vmware driver, removing this will -# cause many extraneous log lines for their tempest runs. Refer to -# https://review.openstack.org/#/c/219225/ for details. -_DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN', - 'qpid=WARN', 'sqlalchemy=WARN', 'suds=INFO', - 'oslo_messaging=INFO', 'iso8601=WARN', - 'requests.packages.urllib3.connectionpool=WARN', - 'urllib3.connectionpool=WARN', 'websocket=WARN', - 'keystonemiddleware=WARN', 'routes.middleware=WARN', - 'stevedore=WARN', 'glanceclient=WARN'] - -_DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' - '%(levelname)s %(name)s [%(request_id)s ' - '%(user_identity)s] %(instance)s' - '%(message)s') +_EXTRA_DEFAULT_LOG_LEVELS = ['glanceclient=WARN'] def parse_args(argv, default_config_files=None, configure_db=True, init_rpc=True): - log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS) log.register_options(CONF) + # We use the oslo.log default log levels which includes suds=INFO + # and add only the extra levels that Nova needs + log.set_defaults(default_log_levels=log.get_default_log_levels() + + _EXTRA_DEFAULT_LOG_LEVELS) options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION, sqlite_db='nova.sqlite') rpc.set_defaults(control_exchange='nova')