summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rw-r--r--packaging/common/rabbitmq-server.init15
1 files changed, 1 insertions, 14 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index 54fd39b790..8ef1000bdb 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -22,7 +22,6 @@ DAEMON=/usr/sbin/${NAME}
CONTROL=/usr/sbin/rabbitmqctl
DESC=rabbitmq-server
USER=rabbitmq
-TIMEOUT=10
ROTATE_SUFFIX=
INIT_LOG_DIR=/var/log/rabbitmq
@@ -40,7 +39,7 @@ start_rabbitmq () {
set +e
nohup $DAEMON > ${INIT_LOG_DIR}/startup_log \
2> ${INIT_LOG_DIR}/startup_err &
- wait_for_rabbitmq
+ $CONTROL wait >/dev/null 2>&1
case "$?" in
0)
echo SUCCESS
@@ -59,18 +58,6 @@ start_rabbitmq () {
fi
}
-wait_for_rabbitmq() {
- WAITED=0
- while [ $WAITED != $TIMEOUT ]; do
- if status_rabbitmq quiet ; then
- return 0
- fi
- sleep 1
- WAITED=`expr $WAITED + 1`
- done
- return 1
-}
-
stop_rabbitmq () {
set +e
status_rabbitmq quiet