diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmqctl | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl.bat | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 495b06b3c4..cbdf3f454d 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. @@ -27,7 +31,6 @@ exec ${ERL_DIR}erl \ -noinput \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ - -sname rabbitmqctl$$ \ -boot "${CLEAN_BOOT_FILE}" \ -sasl errlog_type error \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 22eabf940b..9266a48034 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 ^
@@ -62,7 +66,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( !RABBITMQ_CTL_ERL_ARGS! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--sname rabbitmqctl!RANDOM!!TIME:~9! ^
-s rabbit_control_main ^
-nodename !RABBITMQ_NODENAME! ^
-extra !STAR!
|