diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-11-07 12:47:18 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-11-07 12:47:18 +0000 |
| commit | d82d34cb379cc6c00f02b42288e176a298f696b6 (patch) | |
| tree | 24ac469a2a701d91b01da2c7e985267a754bf7fc /packaging | |
| parent | cc9747ed9b514debc212a380eaee769c4711dee2 (diff) | |
| parent | c60fdf21357804931761fa154c803259dcdf20c6 (diff) | |
| download | rabbitmq-server-git-d82d34cb379cc6c00f02b42288e176a298f696b6.tar.gz | |
Merge bug24430.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 8 |
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 |