Logrotate script calls init.d script instead

of calling rabbitmq-multi directly

4 files changed, 29 insertions, 4 deletions

diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d
index a7e6b98ce6..dc0c26989a 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/RPMS/Fedora/init.d
@@ -23,6 +23,7 @@ NAME=rabbitmq-server
 DESC=rabbitmq-server
 USER=rabbitmq
 NODE_COUNT=1
+ROTATE_SUFFIX=
 
 LOCK_FILE=/var/lock/subsys/$NAME
 
@@ -82,6 +83,13 @@ restart_rabbitmq () {
     echo "$NAME."
 }
 
+rotate_logs_rabbitmq() {
+    set +e
+    su $USER -s /bin/sh -c "$DAEMON rotate_logs_all ${ROTATE_SUFFIX}" 2>&1
+    RETVAL=$?
+    set -e
+}
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
@@ -93,6 +101,10 @@ case "$1" in
 	stop_rabbitmq
 	echo "$NAME."
 	;;
+  rotate-logs)
+	echo -n "Rotating log files for $DESC: "
+	rotate_logs_rabbitmq
+	;;
   force-reload|reload|restart)
         restart_rabbitmq
 	;;
@@ -106,7 +118,7 @@ case "$1" in
         restart_rabbitmq
         ;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" >&2
+	echo "Usage: $0 {start|stop|rotate-logs|status|restart|condrestart|try-restart|reload|force-reload}" >&2
 	RETVAL=1
 	;;
 esac
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
index 8b5811d849..64cd01a185 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.logrotate
+++ b/packaging/RPMS/Fedora/rabbitmq-server.logrotate
@@ -7,6 +7,6 @@
         notifempty
         sharedscripts
         postrotate
-            /usr/sbin/rabbitmq-multi rotate_logs_all > /dev/null 2>&1
+            /sbin/service rabbitmq-server rotate-logs
         endscript
 }
\ No newline at end of file
diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d
index ae82dd5c9a..c3c180a8f4 100644
--- a/packaging/debs/Debian/debian/init.d
+++ b/packaging/debs/Debian/debian/init.d
@@ -15,6 +15,7 @@ NAME=rabbitmq-server
 DESC=rabbitmq-server
 USER=rabbitmq
 NODE_COUNT=1
+ROTATE_SUFFIX=
 
 test -x $DAEMON || exit 0
 
@@ -51,6 +52,14 @@ stop_rabbitmq () {
     set -e
 }
 
+rotate_logs_rabbitmq() {
+    set +e
+    su $USER -s /bin/sh -c "$DAEMON rotate_logs_all ${ROTATE_SUFFIX}" 2>&1
+    RETVAL=$?
+    set -e
+
+}
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
@@ -62,6 +71,10 @@ case "$1" in
 	stop_rabbitmq
 	echo "$NAME."
 	;;
+  rotate-logs)
+    echo -n "Rotating log files for $DESC: "
+    rotate_logs_rabbitmq
+    ;;
   force-reload|restart)
 	echo -n "Restarting $DESC: "
 	stop_rabbitmq
@@ -69,7 +82,7 @@ case "$1" in
 	echo "$NAME."
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	echo "Usage: $0 {start|stop|rotate-logs|restart|force-reload}" >&2
 	exit 1
 	;;
 esac
diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
index 8b5811d849..247635d19a 100644
--- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate
+++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
@@ -7,6 +7,6 @@
         notifempty
         sharedscripts
         postrotate
-            /usr/sbin/rabbitmq-multi rotate_logs_all > /dev/null 2>&1
+            /etc/init.d/rabbitmq-server rotate-logs
         endscript
 }
\ No newline at end of file