logrotate: fix rotation

Fixes: #3554
Always reload with Upstart because in some configs the init.d script doesn't work

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/logrotate.conf b/src/logrotate.conf
index 97d4fcdc5456610a651b14933fde21d1b574f893..c4857f00c10a6050137a3488df4a93a3182f3299 100644 (file)
--- a/src/logrotate.conf
+++ b/src/logrotate.conf
@@ -8,7 +8,9 @@
             invoke-rc.d ceph reload >/dev/null
         elif which service && [ -x `which service` ]; then
             service ceph reload >/dev/null
-        elif which initctl && [ -x `which initctl` ]; then
+        fi
+        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
+        if which initctl && [ -x `which initctl` ]; then
             # upstart reload isn't very helpful here:
             #   https://bugs.launchpad.net/upstart/+bug/1012938
             for type in mon osd mds; do