Merge pull request #1521 from rabbitmq/rabbitmq-server-1508-master

Merge rabbitmq-server-1508 branch to master

Author: michaelklishin

scripts/rabbitmq-env

@@ -348,9 +348,9 @@ run_escript()
     exec "${ERL_DIR}erl" +B \
         -boot "${CLEAN_BOOT_FILE}" \
         -noinput -noshell -hidden -smp enable \
-        ${RABBITMQ_CTL_ERL_ARGS} \
-        -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN \
-        -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX \
+        $RABBITMQ_CTL_ERL_ARGS \
+        -kernel inet_dist_listen_min "$RABBITMQ_CTL_DIST_PORT_MIN" \
+        -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \
         -sasl errlog_type error \
         -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
         -nodename "$RABBITMQ_NODENAME" \

scripts/rabbitmq-env.bat

@@ -74,14 +74,16 @@ for /f "delims=" %%F in ("!RABBITMQ_BASE!") do set RABBITMQ_BASE=%%~sF
 
 REM Check for the short names here too
 if "!RABBITMQ_USE_LONGNAME!"=="true" (
-    set RABBITMQ_NAME_TYPE="-name"
+    set RABBITMQ_NAME_TYPE=-name
     set NAMETYPE=longnames
 ) else (
     if "!USE_LONGNAME!"=="true" (
-        set RABBITMQ_NAME_TYPE="-name"
+        set RABBITMQ_USE_LONGNAME=true
+        set RABBITMQ_NAME_TYPE=-name
         set NAMETYPE=longnames
     ) else (
-        set RABBITMQ_NAME_TYPE="-sname"
+        set RABBITMQ_USE_LONGNAME=false
+        set RABBITMQ_NAME_TYPE=-sname
         set NAMETYPE=shortnames
     )
 )

scripts/rabbitmq-server.bat

@@ -55,12 +55,13 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co
 
 "!ERLANG_HOME!\bin\erl.exe" ^
         -pa "!RABBITMQ_EBIN_ROOT!" ^
+        -boot !CLEAN_BOOT_FILE! ^
         -noinput -hidden ^
         -s rabbit_prelaunch ^
+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
         -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
         -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
-        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
         -extra "!RABBITMQ_NODENAME!"
 
 if ERRORLEVEL 2 (

scripts/rabbitmq-service.bat

@@ -139,12 +139,14 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co
 
 "!ERLANG_HOME!\bin\erl.exe" ^
         -pa "!RABBITMQ_EBIN_ROOT!" ^
+        -boot !CLEAN_BOOT_FILE! ^
         -noinput -hidden ^
         -s rabbit_prelaunch ^
+        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
         -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
         -rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
         -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
-        !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost
+        -extra "!RABBITMQ_NODENAME!"
 
 if ERRORLEVEL 3 (
     rem ERRORLEVEL means (or greater) so we need to catch all other failure