diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-07-27 17:11:10 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-07-27 17:11:10 +0100 |
| commit | c9289ca0130eb87eec3665fc78460df044dcbeda (patch) | |
| tree | 37b4db60b9a7a746b87d25302638740905fff016 | |
| parent | e860bf24578762a62776957951def8198dc32d8d (diff) | |
| download | rabbitmq-server-c9289ca0130eb87eec3665fc78460df044dcbeda.tar.gz | |
Always write the pid file, and write it in /var/run for debs/RPMs.
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index 039738da..e2815f04 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -24,7 +24,7 @@ DESC=rabbitmq-server USER=rabbitmq ROTATE_SUFFIX= INIT_LOG_DIR=/var/log/rabbitmq -PID_FILE=/var/lib/rabbitmq/pid +PID_FILE=/var/run/rabbitmq/pid LOCK_FILE= # This is filled in when building packages diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 6edce6be..d290e29c 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -24,10 +24,6 @@ SERVER_START_ARGS= . `dirname $0`/rabbitmq-env -if [ -n "$RABBITMQ_PID_FILE" ] ; then - echo $$ > $RABBITMQ_PID_FILE -fi - DEFAULT_NODE_IP_ADDRESS=auto DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} @@ -51,6 +47,7 @@ fi [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} +[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${MNESIA_DIR}/pid [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand @@ -71,6 +68,8 @@ fi RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' +echo $$ > $RABBITMQ_PID_FILE + RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then if erl \ |