summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-10-13 16:51:53 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-10-13 16:51:53 +0100
commit9e8e0da1d388acc64bc5263848edfd0943282153 (patch)
tree80f1cab0f305b605c7f0d8f4fb327171c5222f5c
parent73bf86e97f63597da2bbd6567d5940d05d47924f (diff)
parent1f357d9fd629fc2de23b1a65895be8366b7f1ae5 (diff)
downloadrabbitmq-server-git-9e8e0da1d388acc64bc5263848edfd0943282153.tar.gz
Merge bug24478
-rwxr-xr-xscripts/rabbitmq-server10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 11cc7215bb..1831f87699 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -65,8 +65,14 @@ fi
RABBITMQ_START_RABBIT=
[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
-mkdir -p $(dirname ${RABBITMQ_PID_FILE})
-echo $$ > ${RABBITMQ_PID_FILE}
+case "$(uname -s)" in
+ CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
+ # will not be able to make sense of it anyway
+ ;;
+ *) mkdir -p $(dirname ${RABBITMQ_PID_FILE});
+ echo $$ > ${RABBITMQ_PID_FILE}
+ ;;
+esac
RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then