diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-16 03:08:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 03:08:55 +0300 |
| commit | d9c3ed478dbf374d40350973bc845a210cb54873 (patch) | |
| tree | e1c1ead9c535cc4dfca0c9d6eb162b77b1e56a5b | |
| parent | 6b26e67b116b9428445ff48c38105b504354cc3c (diff) | |
| parent | 1ccb20e33c1e30a25e70392a45ec2da6ab0e6078 (diff) | |
| download | rabbitmq-server-git-d9c3ed478dbf374d40350973bc845a210cb54873.tar.gz | |
Merge pull request #1517 from rabbitmq/revert-1515-rabbitmq-server-1508-master
Revert "Merge rabbitmq-server-1508 to master"
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 14 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 1a892b363c..311cfa3f5e 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/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!
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index f285bee2f5..e1518ff049 100755 --- a/scripts/rabbitmq-env +++ b/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" "$@" diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index d8d50ad0c9..17471291cb 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/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!
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 7d2ede42ca..de94df6d57 100644 --- a/scripts/rabbitmqctl.bat +++ b/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!
|