diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 12:31:06 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-21 12:31:06 +0000 |
| commit | 8af2f4a7b4a1d8b9e8c8a056cad519963bd77d72 (patch) | |
| tree | b4f221ce567a2aa612ca31309240edc698fceae9 | |
| parent | 5d70309d6f9fd3aefd034a4cebf4d8fda438e6f3 (diff) | |
| download | rabbitmq-server-bug24494.tar.gz | |
Start epmd in the Windows-y way on Cygwin.bug24494
| -rwxr-xr-x | scripts/rabbitmq-server | 8 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index e29ef22f..e5a197a7 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -61,16 +61,16 @@ RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' case "$(uname -s)" in - CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait + CYGWIN*) erl -noinput -hidden -sname "epmd_${RABBITMQ_NODENAME}" -s init stop + # 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}); + *) epmd -daemon || exit 1 + mkdir -p $(dirname ${RABBITMQ_PID_FILE}); echo $$ > ${RABBITMQ_PID_FILE} ;; esac -epmd -daemon || exit 1 - RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then if erl \ diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index c962410a..e2ddc850 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -26,7 +26,12 @@ ##--- End of overridden <var_name> variables -epmd -daemon || exit 1 +case "$(uname -s)" in + CYGWIN*) erl -noinput -hidden -sname "epmd_${RABBITMQ_NODENAME}" -s init stop + ;; + *) epmd -daemon || exit 1 + ;; +esac exec erl \ -pa "${RABBITMQ_HOME}/ebin" \ |