diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-15 23:16:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 23:16:22 +0300 |
| commit | a47c23d193e872105b1c2a2fa9176fe4c056cc7f (patch) | |
| tree | 5e36bbd9477b62e6b49bcbf75852dd287bca7d4c /scripts | |
| parent | 37d63af754aea9d0475242c7d2ef3160aaafadef (diff) | |
| parent | 05288c4faf6db17a90d041fff54e58f9a50ea5f3 (diff) | |
| download | rabbitmq-server-git-a47c23d193e872105b1c2a2fa9176fe4c056cc7f.tar.gz | |
Merge pull request #1515 from rabbitmq/rabbitmq-server-1508-master
Merge rabbitmq-server-1508 to master
Diffstat (limited to 'scripts')
| -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, 11 insertions, 9 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 311cfa3f5e..1a892b363c 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 e1518ff049..f285bee2f5 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,16 +344,18 @@ 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_CTL_ERL_ARGS} \ - -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN \ - -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX \ + "$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" \ -sasl errlog_type error \ - -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - -nodename "$RABBITMQ_NODENAME" \ + -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 17471291cb..d8d50ad0c9 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 de94df6d57..7d2ede42ca 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!
|