Merge pull request #5787: logrotate reload error on Ubuntu 14.04

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Oct 3, 2015 · cb3aef6 · cb3aef6
2 parents 2088d57 + 7475a8f
commit cb3aef6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/logrotate.conf b/src/logrotate.conf
@@ -4,10 +4,10 @@
     compress
     sharedscripts
     postrotate
-        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
-            invoke-rc.d ceph reload >/dev/null
-        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
+        if which service > /dev/null 2>&1 && [ -x `which service` ]; then
             service ceph reload >/dev/null
+        elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
+            invoke-rc.d ceph reload >/dev/null
         fi
         # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
         if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then

diff --git a/src/rgw/logrotate.conf b/src/rgw/logrotate.conf
@@ -4,10 +4,10 @@
     compress
     sharedscripts
     postrotate
-        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
-            invoke-rc.d radosgw reload >/dev/null
-        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
+        if which service > /dev/null 2>&1 && [ -x `which service` ]; then
             service ceph-radosgw reload >/dev/null
+        elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
+            invoke-rc.d radosgw reload >/dev/null
         fi
         # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
         if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then