diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2018-02-15 08:30:59 -0800 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2018-10-19 17:47:47 -0700 |
| commit | 0a258f947aa86a9e0eed6653bcccbd3dc8880166 (patch) | |
| tree | dd9968b53f06d584af4b22cb4386e57afca1b1a7 | |
| parent | aad01b4bac34c6198906fce36ad39e71256d8ba8 (diff) | |
| download | rabbitmq-server-git-0a258f947aa86a9e0eed6653bcccbd3dc8880166.tar.gz | |
Remove unused -nodename argument to erl, ensure that RABBITMQ_NAME_TYPE is used correctly in Windows batch files
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 9ab60c5a9e..5afd584d8b 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -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!
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index ea4d0c8832..f4da04d660 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -400,12 +400,12 @@ run_escript() exec "${ERL_DIR}erl" +B \ -boot "$CLEAN_BOOT_FILE" \ -noinput -noshell -hidden -smp enable \ + "$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" \ -run escript start \ -escript main "$escript_main" \ -extra "$escript" "$@" diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index ba207719b4..ce9b0bf5cf 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -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" !STAR!
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 8a38a42a23..6144a87c61 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -229,10 +229,10 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" ( -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 (
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 93645a5a36..c58076a405 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -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!
|