diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-21 12:29:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 12:29:28 +0300 |
| commit | da988060c5557d453dd3de99a2e2f48f7f31fdfc (patch) | |
| tree | 3c22e14cfff65c35b429a68914db50f66d20ecf6 | |
| parent | 41ec73b886a23c80f40960137d8a11de6454e50c (diff) | |
| parent | 717dfeea6e40c597c3dd083e9bf8da205a810352 (diff) | |
| download | rabbitmq-server-git-da988060c5557d453dd3de99a2e2f48f7f31fdfc.tar.gz | |
Merge pull request #1514 from rabbitmq/rabbitmq-server-1508
RABBITMQ_NAME_TYPE should be correctly set in Windows batch files
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 13 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 1 |
7 files changed, 17 insertions, 14 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 311cfa3f5e..7260e2f6ee 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -53,7 +53,6 @@ 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 e1518ff049..5214c686d2 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -344,16 +344,17 @@ 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_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-env.bat b/scripts/rabbitmq-env.bat index 8b27f83cc2..78c0499699 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -74,14 +74,16 @@ for /f "delims=" %%F in ("!RABBITMQ_BASE!") do set RABBITMQ_BASE=%%~sF REM Check for the short names here too
if "!RABBITMQ_USE_LONGNAME!"=="true" (
- set RABBITMQ_NAME_TYPE="-name"
+ set RABBITMQ_NAME_TYPE=-name
set NAMETYPE=longnames
) else (
if "!USE_LONGNAME!"=="true" (
- set RABBITMQ_NAME_TYPE="-name"
+ set RABBITMQ_USE_LONGNAME=true
+ set RABBITMQ_NAME_TYPE=-name
set NAMETYPE=longnames
) else (
- set RABBITMQ_NAME_TYPE="-sname"
+ set RABBITMQ_USE_LONGNAME=false
+ set RABBITMQ_NAME_TYPE=-sname
set NAMETYPE=shortnames
)
)
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 17471291cb..b7ee8df7fd 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -53,7 +53,6 @@ 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/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 4a4d36412f..7f3751f298 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -55,12 +55,13 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co "!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
+ -boot !CLEAN_BOOT_FILE! ^
-noinput -hidden ^
-s rabbit_prelaunch ^
+ !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
- !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
-extra "!RABBITMQ_NODENAME!"
if ERRORLEVEL 2 (
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 232a45d6cb..cef481c252 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -139,12 +139,14 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co "!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
+ -boot !CLEAN_BOOT_FILE! ^
-noinput -hidden ^
-s rabbit_prelaunch ^
+ !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
-rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
- !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost
+ -extra "!RABBITMQ_NODENAME!"
if ERRORLEVEL 3 (
rem ERRORLEVEL means (or greater) so we need to catch all other failure
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index de94df6d57..9b9612c5c7 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -53,7 +53,6 @@ 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!
|