Skip to content

Merge rabbitmq-server-1508 to master #1515

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 8 commits into from
Feb 15, 2018
Merged

Merge rabbitmq-server-1508 to master #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2254c8f
rabbit_router:match_bindings/2 optimize (uses ets:select directly); i…
sylvain-hh Feb 11, 2018
41ec73b
Merge pull request #1509 from rabbitmq/rabbitmq-server-1508
michaelklishin Feb 13, 2018
6bfe539
Remove unused -nodename argument to erl, ensure that RABBITMQ_NAME_TY…
lukebakken Feb 15, 2018
c33dc4b
Merge branch 'rabbitmq-server-1508' into rabbitmq-server-1508-master
lukebakken Feb 15, 2018
ae7799a
Add line continuation
lukebakken Feb 15, 2018
d8edb8a
Merge branch 'rabbitmq-server-1508' into rabbitmq-server-1508-master
lukebakken Feb 15, 2018
847b118
Fix line continuation
lukebakken Feb 15, 2018
05288c4
Merge branch 'rabbitmq-server-1508' into rabbitmq-server-1508-master
lukebakken Feb 15, 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
2 changes: 1 addition & 1 deletion scripts/rabbitmq-diagnostics.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
14 changes: 8 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,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" "$@"
Expand Down
2 changes: 1 addition & 1 deletion scripts/rabbitmq-plugins.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion scripts/rabbitmqctl.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down