summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <david@rabbitmq.com>2011-04-26 11:40:29 +0100
committerDavid Wragg <david@rabbitmq.com>2011-04-26 11:40:29 +0100
commitc75b4aaebf0fb1ade23f4fb501584f27acc8c829 (patch)
tree3f663e4dd76bccc9895260d0bdd47a8067611a7b
parent8349e8614e4eafbe04cf657c74a5af3ac6177c34 (diff)
parent2f874e49bc2e809fdb8e6ba4905113f2ba9419c6 (diff)
downloadrabbitmq-server-c75b4aaebf0fb1ade23f4fb501584f27acc8c829.tar.gz
Merge bug24060 into default (init script rotate-logs action is broken)
-rw-r--r--packaging/common/rabbitmq-server.init3
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index f3bdc3d2..d8a7a94d 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -28,6 +28,7 @@ INIT_LOG_DIR=/var/log/rabbitmq
LOCK_FILE= # This is filled in when building packages
test -x $DAEMON || exit 0
+test -x $CONTROL || exit 0
RETVAL=0
set -e
@@ -94,7 +95,7 @@ status_rabbitmq() {
rotate_logs_rabbitmq() {
set +e
- $DAEMON rotate_logs ${ROTATE_SUFFIX}
+ $CONTROL rotate_logs ${ROTATE_SUFFIX}
if [ $? != 0 ] ; then
RETVAL=1
fi