From 6f91db58e054012c1ec3aac9c446b1c724d2b23c Mon Sep 17 00:00:00 2001 From: Michael Kerrin Date: Wed, 17 Apr 2013 17:35:18 +0000 Subject: Update the log module from oslo-incubator Contains fix to stop the logger system from logging events twice. Also includes PID in default logging_context_format_string Fixes bug: 1170049 Change-Id: I007786604138c41fbcf1127c01339132c56a6aab --- nova/openstack/common/log.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nova/openstack') diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py index e40a803c5..49dbadebe 100644 --- a/nova/openstack/common/log.py +++ b/nova/openstack/common/log.py @@ -112,9 +112,9 @@ generic_log_opts = [ log_opts = [ cfg.StrOpt('logging_context_format_string', - default='%(asctime)s.%(msecs)03d %(levelname)s %(name)s ' - '[%(request_id)s %(user)s %(tenant)s] %(instance)s' - '%(message)s', + default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' + '%(name)s [%(request_id)s %(user)s %(tenant)s] ' + '%(instance)s%(message)s', help='format string to use for log messages with context'), cfg.StrOpt('logging_default_format_string', default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' @@ -432,14 +432,11 @@ def _setup_logging_from_conf(): else: log_root.setLevel(logging.WARNING) - level = logging.NOTSET for pair in CONF.default_log_levels: mod, _sep, level_name = pair.partition('=') level = logging.getLevelName(level_name) logger = logging.getLogger(mod) logger.setLevel(level) - for handler in log_root.handlers: - logger.addHandler(handler) _loggers = {} -- cgit