diff options
author | Roman Podoliaka <rpodolyaka@mirantis.com> | 2014-11-11 11:05:43 +0200 |
---|---|---|
committer | Matt Riedemann <mriedem@us.ibm.com> | 2015-08-06 23:30:20 +0000 |
commit | 90dd93c52b98e67994f0dd78ec5b8d11c4cb40ad (patch) | |
tree | e42b38103ede6024d426653db0c8c9587595df77 | |
parent | fafacc48c33146c7b2b5c3b33b3c40cc8f7864a0 (diff) | |
download | oslo-incubator-90dd93c52b98e67994f0dd78ec5b8d11c4cb40ad.tar.gz |
Make use_syslog=True log to syslog via /dev/log
After upgrade from Icehouse to Juno OpenStack services don't log to
syslog via /dev/log anymore. This behaviour was introduced in commit
1188d88a73e75da5c143d0dfad34e10dad0daee0. While /dev/log is arguably
not a very portable default, breaking the backwards compatibility is
even worse.
This commit restores the original behaviour. /dev/log portability
issues will be addressed separately.
Closes-Bug: #1385295
Related-Bug: #1391428
(cherry picked from commit ac4330dd674b073c4d31ef87e61710015ffe6c80)
Conflicts:
openstack/common/log.py
Change-Id: I4e84bca70eee6d6aa8d7525fe38d65ba235dd6b0
-rw-r--r-- | openstack/common/log.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py index af70329b..9e28b0b1 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -517,9 +517,11 @@ def _setup_logging_from_conf(project, version): # TODO(bogdando) use the format provided by RFCSysLogHandler # after existing syslog format deprecation in J if CONF.use_syslog_rfc_format: - syslog = RFCSysLogHandler(facility=facility) + syslog = RFCSysLogHandler(address='/dev/log', + facility=facility) else: - syslog = logging.handlers.SysLogHandler(facility=facility) + syslog = logging.handlers.SysLogHandler(address='/dev/log', + facility=facility) log_root.addHandler(syslog) except socket.error: log_root.error('Unable to add syslog handler. Verify that syslog' |