Uh, it's probably an idea to write out the pidfile as early as possible, in case for example prelaunch fails.

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 94810a37..6edce6be 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -24,6 +24,10 @@ 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}
@@ -97,10 +101,6 @@ RABBITMQ_LISTEN_ARG=
 # there is no other way of preventing their expansion.
 set -f
 
-if [ -n "$RABBITMQ_PID_FILE" ] ; then
-    echo $$ > $RABBITMQ_PID_FILE
-fi
-
 exec erl \
     ${RABBITMQ_EBIN_PATH} \
     ${RABBITMQ_START_RABBIT} \