Merge branch 'master' into stable

5 files changed, 4 insertions, 30 deletions

diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index 84ed9fdc53..d595620042 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -19,12 +19,12 @@
 # Non-empty defaults should be set in rabbitmq-env
 . `dirname $0`/rabbitmq-env
 
+RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
 exec ${ERL_DIR}erl \
     -pa "${RABBITMQ_HOME}/ebin" \
     -noinput \
     -hidden \
     ${RABBITMQ_PLUGINS_ERL_ARGS} \
-    ${RABBITMQ_NAME_TYPE} rabbitmq-plugins$$ \
     -boot "${CLEAN_BOOT_FILE}" \
     -s rabbit_plugins_main \
     -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 8a3c1f330f..01a64c99e5 100755
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -23,14 +23,6 @@ set TDP0=%~dp0
 set STAR=%*

 setlocal enabledelayedexpansion

 

-if "!RABBITMQ_USE_LONGNAME!"=="" (

-    set RABBITMQ_NAME_TYPE="-sname"

-)

-

-if "!RABBITMQ_USE_LONGNAME!"=="true" (

-    set RABBITMQ_NAME_TYPE="-name"

-)

-

 if "!RABBITMQ_SERVICENAME!"=="" (

     set RABBITMQ_SERVICENAME=RabbitMQ

 )

@@ -52,7 +44,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

     echo RabbitMQ server distribution in the Erlang lib folder.

     echo.

-    exit /B

+    exit /B 1

 )

 

 if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (

@@ -68,7 +60,6 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
 -noinput ^

 -hidden ^

 !RABBITMQ_CTL_ERL_ARGS! ^

-!RABBITMQ_NAME_TYPE! rabbitmq-plugins!RANDOM!!TIME:~9! ^

 -s rabbit_plugins_main ^

 -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^

 -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" ^

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 0f27006560..b72b9ee0d5 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -70,7 +70,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

     echo RabbitMQ server distribution in the Erlang lib folder.

     echo.

-    exit /B

+    exit /B 1

 )

 

 if "!RABBITMQ_MNESIA_BASE!"=="" (

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index d437e251ab..2237275c47 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -19,11 +19,6 @@
 # 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 ${RABBITMQ_NAME_TYPE} rabbitmqctl-prelaunch-$$ -noinput \
--eval 'erlang:halt().' -boot "${CLEAN_BOOT_FILE}"
-
 # We specify Mnesia dir and sasl error logger since some actions
 # (e.g. forget_cluster_node --offline) require us to impersonate the
 # real node.
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 6eb2530a4e..380b57a2b7 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -27,14 +27,6 @@ if "!RABBITMQ_BASE!"=="" (
     set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "!RABBITMQ_USE_LONGNAME!"=="" (

-    set RABBITMQ_NAME_TYPE="-sname"

-)

-

-if "!RABBITMQ_USE_LONGNAME!"=="true" (

-    set RABBITMQ_NAME_TYPE="-name"

-)

-

 if "!COMPUTERNAME!"=="" (

     set COMPUTERNAME=localhost

 )

@@ -60,13 +52,9 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

     echo RabbitMQ server distribution in the Erlang lib folder.

     echo.

-    exit /B

+    exit /B 1

 )

 

-rem rabbitmqctl starts distribution itself, so we need to make sure epmd

-rem is running.

-"!ERLANG_HOME!\bin\erl.exe" !RABBITMQ_NAME_TYPE! rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -noinput -eval "erlang:halt()."

-

 "!ERLANG_HOME!\bin\erl.exe" ^

 -pa "!TDP0!..\ebin" ^

 -noinput ^