summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-07-07 13:50:52 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-07-07 13:50:52 +0100
commit9cbde47bcd42a4d33ef571bf459202bae41f0d2e (patch)
tree34417c67f9abd80f3a3d29cb9e6716c0ca18d79e
parentf5f658805bf9fb61ba8e7ebe0999de16e66d8135 (diff)
downloadrabbitmq-server-bug26192.tar.gz
Start a dummy node first to ensure epmd is running.bug26192
-rwxr-xr-xscripts/rabbitmqctl4
-rwxr-xr-xscripts/rabbitmqctl.bat4
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 032d10bf..cbdf3f45 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -19,6 +19,10 @@
# Non-empty defaults should be set in rabbitmq-env
. `dirname $0`/rabbitmq-env
+# rabbitmqctl starts distribution itself, so we need to make sure epmd
+# is running.
+${ERL_DIR}erl -sname rabbitmqctl-prelaunch-$$ -eval 'erlang:halt().'
+
# We specify Mnesia dir and sasl error logger since some actions
# (e.g. forget_cluster_node --offline) require us to impersonate the
# real node.
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index a3734088..9266a480 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -55,6 +55,10 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
exit /B
)
+rem rabbitmqctl starts distribution itself, so we need to make sure epmd
+rem is running.
+"!ERLANG_HOME!\bin\erl.exe" -sname rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -eval "erlang:halt()."
+
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!TDP0!..\ebin" ^
-noinput ^