summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2012-05-16 15:38:21 +0100
committerTim Watson <tim@rabbitmq.com>2012-05-16 15:38:21 +0100
commit5a1ac0ab2e83d9ddbc44571590fc7c278877cfaf (patch)
tree6d23e4a69e319c2f925cff0e5a7c5d9028508f88
parent87e5459f49ecf8c4a98da1d4570c4a7cfae0efc7 (diff)
downloadrabbitmq-server-git-5a1ac0ab2e83d9ddbc44571590fc7c278877cfaf.tar.gz
on windows, die in the correct manner when node name is already in use
-rwxr-xr-xscripts/rabbitmq-server.bat8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 58f085af1d..09d4661f98 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -89,13 +89,15 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (
set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
-if not "!ERLANG_HOME!\bin\erl.exe" ^
+"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput -hidden ^
-s rabbit_prelaunch ^
-sname rabbitmqprelaunch!RANDOM! ^
- -extra "!RABBITMQ_NODENAME!" (
- exit /B
+ -extra "!RABBITMQ_NODENAME!"
+
+if ERRORLEVEL 1 (
+ exit /B 1
)
set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"