diff options
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 7 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index d8a7a94d56..c489233f30 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -24,6 +24,7 @@ DESC=rabbitmq-server USER=rabbitmq ROTATE_SUFFIX= INIT_LOG_DIR=/var/log/rabbitmq +PID_FILE=/var/lib/rabbitmq/pid LOCK_FILE= # This is filled in when building packages @@ -40,8 +41,8 @@ start_rabbitmq () { else RETVAL=0 set +e - setsid sh -c "$DAEMON > ${INIT_LOG_DIR}/startup_log \ - 2> ${INIT_LOG_DIR}/startup_err" & + setsid sh -c "PID_FILE=$PID_FILE $DAEMON > \ + ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" & $CONTROL wait >/dev/null 2>&1 RETVAL=$? set -e @@ -53,6 +54,7 @@ start_rabbitmq () { fi ;; *) + rm -f $PID_FILE echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\} RETVAL=1 ;; @@ -68,6 +70,7 @@ stop_rabbitmq () { RETVAL=$? set -e if [ $RETVAL = 0 ] ; then + rm -f $PID_FILE if [ -n "$LOCK_FILE" ] ; then rm -f $LOCK_FILE fi diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 2f80eb96c3..13584541db 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -97,6 +97,10 @@ RABBITMQ_LISTEN_ARG= # there is no other way of preventing their expansion. set -f +if [ -n "$PID_FILE" ] ; then + echo $$ > $PID_FILE +fi + exec erl \ ${RABBITMQ_EBIN_PATH} \ ${RABBITMQ_START_RABBIT} \ |