diff options
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 7 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 7260e2f6ee..311cfa3f5e 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -53,6 +53,7 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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 5214c686d2..2a1730f302 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,17 +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_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 b7ee8df7fd..17471291cb 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -53,6 +53,7 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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 9b9612c5c7..de94df6d57 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -53,6 +53,7 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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!
|