summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-03-18 11:55:07 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-03-18 11:55:07 +0000
commit40e2d8fb4a036b591c718856e589376a3000e29a (patch)
tree3e4dd9a1298b4db72bcfbdce1f9e439064f7569e
parentda9cc70d9c46e32c8c020ef078b7ce59cf5ef11c (diff)
downloadrabbitmq-server-40e2d8fb4a036b591c718856e589376a3000e29a.tar.gz
Oops, we need RABBITMQ_CONFIG_FILE to be set for prelaunch to do its job properly.
-rwxr-xr-xscripts/rabbitmq-service.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 28ee7d30..913e6950 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -176,6 +176,10 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
+if "!RABBITMQ_CONFIG_FILE!"=="" (
+ set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq
+)
+
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput -hidden ^
@@ -194,10 +198,6 @@ if ERRORLEVEL 3 (
set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
)
-if "!RABBITMQ_CONFIG_FILE!"=="" (
- set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq
-)
-
if exist "!RABBITMQ_CONFIG_FILE!.config" (
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
) else (