summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTim Watson <tim.watson@gmail.com>2012-05-21 14:41:57 +0100
committerTim Watson <tim.watson@gmail.com>2012-05-21 14:41:57 +0100
commit13389eb3fb5b53d5c4d5429f7dc052e528391c3d (patch)
tree2b4bfda8316cbb27f562a159ae12a8524b20e349 /scripts
parenta57dae43426c0a0bbffcd361e84f59eda92c7276 (diff)
downloadrabbitmq-server-git-13389eb3fb5b53d5c4d5429f7dc052e528391c3d.tar.gz
manually merge 3c20079f0601
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmqctl2
-rwxr-xr-xscripts/rabbitmqctl.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 4aad6b8f33..a5fade7222 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -32,6 +32,6 @@ exec erl \
-hidden \
${RABBITMQ_CTL_ERL_ARGS} \
-sname rabbitmqctl$$ \
- -s rabbit_control \
+ -s rabbit_control_main \
-nodename $RABBITMQ_NODENAME \
-extra "$@"
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index f37fae48a6..55a3d8b2ea 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -43,7 +43,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
exit /B
)
-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!
+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control_main -nodename !RABBITMQ_NODENAME! -extra !STAR!
endlocal
endlocal