Skip to content

RABBITMQ_NAME_TYPE should be correctly set in Windows batch files #1514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2018
Merged

RABBITMQ_NAME_TYPE should be correctly set in Windows batch files #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c82673
Remove unused -nodename argument to erl, ensure that RABBITMQ_NAME_TY…
lukebakken Feb 15, 2018
5874369
Set node name for rabbit_prelaunch step in Windows scripts
lukebakken Feb 20, 2018
717dfee
Ensure RABBITMQ_USE_LONGNAME is set as that is what rabbitmqctl escri…
lukebakken Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/rabbitmq-diagnostics.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
13 changes: 7 additions & 6 deletions scripts/rabbitmq-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" "$@"
Expand Down
8 changes: 5 additions & 3 deletions scripts/rabbitmq-env.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)
Expand Down
1 change: 0 additions & 1 deletion scripts/rabbitmq-plugins.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
3 changes: 2 additions & 1 deletion scripts/rabbitmq-server.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 3 additions & 1 deletion scripts/rabbitmq-service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/rabbitmqctl.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down