diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2018-02-20 15:27:29 -0800 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2018-02-20 15:27:29 -0800 |
| commit | 1675ca9b3430335b44cc194f707b779fde773cc6 (patch) | |
| tree | e1aab82b387df834dfb6bf91672dbe2eed6b51b2 /scripts | |
| parent | 2a9b16d6e61243c239ddede5741550fc40e44062 (diff) | |
| parent | 717dfeea6e40c597c3dd083e9bf8da205a810352 (diff) | |
| download | rabbitmq-server-git-1675ca9b3430335b44cc194f707b779fde773cc6.tar.gz | |
Merge branch 'rabbitmq-server-1508' into rabbitmq-server-1508-master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 1 | ||||
| -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 | 3 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 1 |
7 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 1a892b363c..7260e2f6ee 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -48,7 +48,6 @@ 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! ^
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index f285bee2f5..5214c686d2 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -350,7 +350,6 @@ 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" \ 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 d8d50ad0c9..b7ee8df7fd 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -48,7 +48,6 @@ 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! ^
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 8171b2b077..cef481c252 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -139,12 +139,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 3 (
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 7d2ede42ca..9b9612c5c7 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -48,7 +48,6 @@ 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! ^
|