From: Tobias Florek <tobias.florek@bytesandbutter.de>
Date: Mon, 1 Oct 2012 16:02:06 +0000 (-0700)
Subject: logrotate: check for executables to avoid cron errors
X-Git-Tag: v0.54~145
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32a6394be0725b4742ebe87d7537b98c7025e4f6;p=ceph.git

logrotate: check for executables to avoid cron errors

Signed-off-by: Tobias Florek <tobias.florek@bytesandbutter.de>
---

diff --git a/src/logrotate.conf b/src/logrotate.conf
index ba7e17666932..4497a51e90f0 100644
--- a/src/logrotate.conf
+++ b/src/logrotate.conf
@@ -4,17 +4,22 @@
     compress
     sharedscripts
     postrotate
-        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
-
-	# upstart reload isn't very helpful here:
-	#   https://bugs.launchpad.net/upstart/+bug/1012938
-	for type in mon osd mds; do
-	    initctl list \
-	    | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
-	    | while read l; do
-	        initctl reload -- $l 2>/dev/null || :
-	    done
-        done
+        if [ -x `which invoke-rc.d` ]
+        then
+            invoke-rc.d ceph reload >/dev/null
+        elif [ -x `which service` ]
+            service ceph reload >/dev/null
+        elif [ -x `which initctl` ]
+            # upstart reload isn't very helpful here:
+            #   https://bugs.launchpad.net/upstart/+bug/1012938
+            for type in mon osd mds; do
+		initctl list \
+		    | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
+		    | while read l; do
+		    initctl reload -- $l 2>/dev/null || :
+		done
+            done
+        fi
     endscript
     missingok
 }