Merge "Fix unintended assignment of "syslog""

This commit is contained in:
Jenkins 2015-09-28 11:10:30 +00:00 committed by Gerrit Code Review
commit 69e0ba3d75

View File

@ -343,10 +343,10 @@ def _setup_logging_from_conf(conf, project, version):
facility = _find_facility(conf.syslog_log_facility) facility = _find_facility(conf.syslog_log_facility)
# TODO(bogdando) use the format provided by RFCSysLogHandler after # TODO(bogdando) use the format provided by RFCSysLogHandler after
# existing syslog format deprecation in J # existing syslog format deprecation in J
syslog = handlers.OSSysLogHandler( syslog_handler = handlers.OSSysLogHandler(
facility=facility, facility=facility,
use_syslog_rfc_format=conf.use_syslog_rfc_format) use_syslog_rfc_format=conf.use_syslog_rfc_format)
log_root.addHandler(syslog) log_root.addHandler(syslog_handler)
datefmt = conf.log_date_format datefmt = conf.log_date_format
for handler in log_root.handlers: for handler in log_root.handlers: