Skip to content
Snippets Groups Projects
Commit bed9ed97 authored by Hui Kang's avatar Hui Kang
Browse files

Remove unnecessary patch for oslo.log

Ubuntu binary package includes the fix

TrivialFix

Change-Id: Iaeff250e75565b1f447d97acfffc1b1a3a76c250
parent 2514bcf0
No related branches found
No related tags found
No related merge requests found
...@@ -39,7 +39,6 @@ RUN yum -y install \ ...@@ -39,7 +39,6 @@ RUN yum -y install \
# This will prevent questions from being asked during the install # This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
COPY oslo-log-bug1499620.patch /var/lib/kolla/oslo-log-bug1499620.patch
# There is no python-tuskarclient in ubuntu 14.04 # There is no python-tuskarclient in ubuntu 14.04
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
python-barbicanclient \ python-barbicanclient \
...@@ -65,9 +64,6 @@ RUN apt-get install -y --no-install-recommends \ ...@@ -65,9 +64,6 @@ RUN apt-get install -y --no-install-recommends \
patch \ patch \
&& apt-get clean && apt-get clean
# python-oslo-log patch to bug 1499620 (it fixed in python-oslo-log 1.11.1)
RUN patch -d /usr/lib/python2.7/site-packages -p1 < /var/lib/kolla/oslo-log-bug1499620.patch
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
......
diff --git a/oslo_log/log.py b/oslo_log/log.py
index 8d8c240..1b19072 100644
--- a/oslo_log/log.py
+++ b/oslo_log/log.py
@@ -285,10 +285,10 @@ def _setup_logging_from_conf(conf, project, version):
facility = _find_facility(conf.syslog_log_facility)
# TODO(bogdando) use the format provided by RFCSysLogHandler after
# existing syslog format deprecation in J
- syslog = handlers.OSSysLogHandler(
+ syslog_handler = handlers.OSSysLogHandler(
facility=facility,
use_syslog_rfc_format=conf.use_syslog_rfc_format)
- log_root.addHandler(syslog)
+ log_root.addHandler(syslog_handler)
datefmt = conf.log_date_format
for handler in log_root.handlers:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment