Merge pull request #1517 from rabbitmq/revert-1515-rabbitmq-server-1508-master

Revert "Merge rabbitmq-server-1508 to master"

Author: michaelklishin

scripts/rabbitmq-diagnostics.bat

@@ -48,12 +48,12 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 "!ERLANG_HOME!\bin\erl.exe" +B ^
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
-!RABBITMQ_NAME_TYPE! rabbitmqescript!RANDOM!!TIME:~9!@localhost ^
 !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! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmq-diagnostics" !STAR!

scripts/rabbitmq-env

@@ -344,18 +344,16 @@ run_escript()
     escript="${1:?escript must be defined}"
     shift
 
-    # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be
-    # word-split
     # shellcheck disable=SC2086
     exec "${ERL_DIR}erl" +B \
-        -boot "$CLEAN_BOOT_FILE" \
+        -boot "${CLEAN_BOOT_FILE}" \
         -noinput -noshell -hidden -smp enable \
-        "$RABBITMQ_NAME_TYPE" "rabbitmqescript$$@localhost" \
-        $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\"" \
+        -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
+        -nodename "$RABBITMQ_NODENAME" \
         -run escript start \
         -escript main "$escript_main" \
         -extra "$escript" "$@"

scripts/rabbitmq-plugins.bat

@@ -48,12 +48,12 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 "!ERLANG_HOME!\bin\erl.exe" +B ^
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
-!RABBITMQ_NAME_TYPE! rabbitmqescript!RANDOM!!TIME:~9!@localhost ^
 !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! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmq-plugins" --formatter=plugins !STAR!

scripts/rabbitmqctl.bat

@@ -48,12 +48,12 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 "!ERLANG_HOME!\bin\erl.exe" +B ^
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
-!RABBITMQ_NAME_TYPE! rabbitmqescript!RANDOM!!TIME:~9!@localhost ^
 !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! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmqctl" !STAR!