summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-11-07 12:06:57 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-11-07 12:06:57 +0000
commitffbe61e27e210ae6e0002418c27f014af9ba8689 (patch)
treee409b82b27e68499a9f5310dbb788b10eee06a30 /packaging
parent61f48f0867ca77de86a224db3ba1855497dc722b (diff)
parentc60fdf21357804931761fa154c803259dcdf20c6 (diff)
downloadrabbitmq-server-git-ffbe61e27e210ae6e0002418c27f014af9ba8689.tar.gz
merge default into bug20337
Diffstat (limited to 'packaging')
-rw-r--r--packaging/common/rabbitmq-server.init8
1 files changed, 5 insertions, 3 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index 15fd5d5b46..4084d8c715 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -56,8 +56,10 @@ start_rabbitmq () {
RETVAL=0
ensure_pid_dir
set +e
- setsid sh -c "RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
- ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" &
+ RABBITMQ_PID_FILE=$PID_FILE setsid $DAEMON \
+ > "${INIT_LOG_DIR}/startup_log" \
+ 2> "${INIT_LOG_DIR}/startup_err" \
+ 0<&- &
$CONTROL wait $PID_FILE >/dev/null 2>&1
RETVAL=$?
set -e
@@ -81,7 +83,7 @@ stop_rabbitmq () {
status_rabbitmq quiet
if [ $RETVAL = 0 ] ; then
set +e
- $CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
+ $CONTROL stop ${PID_FILE} > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
RETVAL=$?
set -e
if [ $RETVAL = 0 ] ; then