root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused -nodename argument to erl, ensure that RABBITMQ_NAME_TYPE is used correctly in Windows batch files

This commit is contained in:
Luke Bakken 2018-02-15 08:30:59 -08:00
parent 41ec73b886
commit 3c82673d9b
No known key found for this signature in database
GPG Key ID: B707DD932540186E
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/rabbitmq-diagnostics.bat
View File

@ -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!

14
scripts/rabbitmq-env
View File

@ -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" "$@"

2
scripts/rabbitmq-plugins.bat
View File

@ -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!

3
scripts/rabbitmq-service.bat
View File

@ -144,7 +144,8 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co
-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
!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

2
scripts/rabbitmqctl.bat
View File

@ -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!