Attachment 899821 Details for Bug 997983 – Candidate 1

[patch] Candidate 1

openstack-swift-bz997983-1.diff (text/plain), 3.26 KB, created by Pete Zaitcev on 2014-05-28 04:41:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2014-05-28 04:41:28 UTC

Size: 3.26 KB

patch

obsolete

>commit 93a01cb74b696414863c9b843524369008422b26
>Author: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
>Date:   Tue May 27 22:39:30 2014 -0600
>
>    Add a fix for 997983, add /var/log/swift/swift.log
>    
>    This version removes local0 and local2 from additional logging into
>    /var/log/messages.
>
>diff --git a/openstack-swift.logrotate b/openstack-swift.logrotate
>new file mode 100644
>index 0000000..f38e268
>--- /dev/null
>+++ b/openstack-swift.logrotate
>@@ -0,0 +1,6 @@
>+/var/log/swift/swift.log
>+{
>+    postrotate
>+        /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || true
>+    endscript
>+}
>diff --git a/openstack-swift.rsyslog b/openstack-swift.rsyslog
>new file mode 100644
>index 0000000..12ba14b
>--- /dev/null
>+++ b/openstack-swift.rsyslog
>@@ -0,0 +1,5 @@
>+# LOCAL0 is the upstream default and LOCAL2 is what Swift gets in
>+# RHOS and RDO if installed with Packstack (also, in docs).
>+# The breakout action prevents logging into /var/log/messages, bz#997983.
>+local0.*;local2.*        /var/log/swift/swift.log
>+&                        ~
>diff --git a/openstack-swift.spec b/openstack-swift.spec
>index 414ca0c..6881ab6 100644
>--- a/openstack-swift.spec
>+++ b/openstack-swift.spec
>@@ -7,7 +7,7 @@
> 
> Name:             openstack-swift
> Version:          1.13.1
>-Release:          1%{?dist}
>+Release:          2%{?dist}
> Summary:          OpenStack Object Storage (Swift)
> 
> Group:            Development/Languages
>@@ -49,6 +49,8 @@ Source61:         proxy-server.conf
> Source62:         object-expirer.conf
> Source20:         %{name}.tmpfs
> Source7:          swift.conf
>+Source71:         %{name}.rsyslog
>+Source72:         %{name}.logrotate
> 
> #
> # patches_base=1.13.1
>@@ -247,9 +249,11 @@ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/account-server
> install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/container-server
> install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/object-server
> install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/proxy-server
>+# syslog
>+install -p -D -m 644 %{SOURCE71} %{buildroot}%{_sysconfdir}/rsyslog.d/swift.conf
>+install -p -D -m 644 %{SOURCE72} %{buildroot}%{_sysconfdir}/logrotate.d/swift
> # Swift run directories
>-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
>-install -p -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tmpfiles.d/openstack-swift.conf
>+install -p -D -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tmpfiles.d/openstack-swift.conf
> # Install recon directory
> install -d -m 755 %{buildroot}%{_localstatedir}/cache/swift
> # Install home directory
>@@ -356,6 +360,8 @@ exit 0
> %config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
> %dir %{_sysconfdir}/swift
> %config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf
>+%config(noreplace) %{_sysconfdir}/rsyslog.d/swift.conf
>+%config(noreplace) %{_sysconfdir}/logrotate.d/swift
> %dir %attr(0755, swift, root) %{_localstatedir}/run/swift
> %dir %attr(0755, swift, root) %{_localstatedir}/cache/swift
> %dir %attr(0755, swift, root) %{_sharedstatedir}/swift
>@@ -469,6 +475,9 @@ exit 0
> %doc LICENSE doc/build/html
> 
> %changelog
>+* Tue May 27 2014 Pete Zaitcev <zaitcev@redhat.com> - 1.13.1-2
>+- Redirect logs to swift.log to fix /var/log/messages flood, bz#997983
>+
> * Sat Apr 19 2014 PÃ¡draig Brady <pbrady@redhat.com> - 1.13.1-1
> - Update to Icehouse release
>

Flags:

zaitcev: review? (apevec)

Actions: View | Diff

Attachments on bug 997983: 809633 | 899821