summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2014-10-30 10:13:36 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2014-10-30 08:31:38 -0700
commit049580f209a1f2bed538d8c3f6953e3789d616f7 (patch)
treef4848675e5b0f227507cfe638c78fd89aa3bc76e
parentdc8a3490e437d25ac2ee94a74778cd16c778514d (diff)
logrotate: gluster logrotate config should not be global
Issue : Previously glusterfs logrotate config file pollutes global config. So moved the directives inside the curly braces, so they don't pollute the global config state. Backport of fix from BZ 1126801, http://review.gluster.org/#/c/9001/ Change-Id: Iafaa6bb295b7dd7554c2654716cc9aeafd6d7a68 BUG: 1158923 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/9013 Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com> Reviewed-by: Justin Clift <justin@gluster.org>
-rw-r--r--extras/glusterfs-logrotate23
1 files changed, 12 insertions, 11 deletions
diff --git a/extras/glusterfs-logrotate b/extras/glusterfs-logrotate
index 373ec2e0b92..e3319afaa96 100644
--- a/extras/glusterfs-logrotate
+++ b/extras/glusterfs-logrotate
@@ -1,17 +1,12 @@
-# perform the log rotate every week
-weekly
-# keep the backup of 52 weeks
-rotate 52
-missingok
-
-# compress the logs, but from the .2 onwards
-compress
-delaycompress
-notifempty
-
# Rotate client logs
/var/log/glusterfs/*.log {
sharedscripts
+ weekly
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
postrotate
/usr/bin/killall -HUP glusterfs > /dev/null 2>&1 || true
/usr/bin/killall -HUP glusterd > /dev/null 2>&1 || true
@@ -21,6 +16,12 @@ notifempty
# Rotate server logs
/var/log/glusterfs/bricks/*.log {
sharedscripts
+ weekly
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
postrotate
/usr/bin/killall -HUP glusterfsd > /dev/null 2>&1 || true
endscript