Index: juno-nova/nova/openstack/common/log.py =================================================================== --- juno-nova.orig/nova/openstack/common/log.py +++ juno-nova/nova/openstack/common/log.py @@ -481,7 +481,7 @@ class RFCSysLogHandler(logging.handlers. # is 'type' (Python 2.7). # Use old style calls, if the type is 'classobj' (Python 2.6) msg = logging.handlers.SysLogHandler.format(self, record) - msg = self.binary_name + ' ' + msg + msg = self.binary_name + msg return msg @@ -517,18 +517,6 @@ def _setup_logging_from_conf(project, ve log_root.addHandler(handler) datefmt = CONF.log_date_format - for handler in log_root.handlers: - # NOTE(alaski): CONF.log_format overrides everything currently. This - # should be deprecated in favor of context aware formatting. - if CONF.log_format: - handler.setFormatter(logging.Formatter(fmt=CONF.log_format, - datefmt=datefmt)) - log_root.info('Deprecated: log_format is now deprecated and will ' - 'be removed in the next release') - else: - handler.setFormatter(ContextFormatter(project=project, - version=version, - datefmt=datefmt)) if CONF.debug: log_root.setLevel(logging.DEBUG) @@ -587,6 +575,19 @@ def _setup_logging_from_conf(project, ve log_root.error(_('Unable to add syslog handler. Verify that ' 'syslog is running.')) + for handler in log_root.handlers: + # NOTE(alaski): CONF.log_format overrides everything currently. This + # should be deprecated in favor of context aware formatting. + if CONF.log_format: + handler.setFormatter(logging.Formatter(fmt=CONF.log_format, + datefmt=datefmt)) + log_root.info('Deprecated: log_format is now deprecated and will ' + 'be removed in the next release') + else: + handler.setFormatter(ContextFormatter(project=project, + version=version, + datefmt=datefmt)) + _loggers = {}