diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-01-30 19:10:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 19:10:38 +0300 |
| commit | a8b9585f76e23a52edc4d134fa2534c7f6e91ac3 (patch) | |
| tree | 9ff9ffeb194d5f955cb5eeadf6b2d92c72e0106f | |
| parent | fd6d0e1bd60ad23c3e7fed651b751135c73b5c43 (diff) | |
| parent | 9bd43f543bdc43ca50d04a75b594a59f9e50c6fe (diff) | |
| download | rabbitmq-server-git-a8b9585f76e23a52edc4d134fa2534c7f6e91ac3.tar.gz | |
Merge pull request #1491 from rabbitmq/rabbitmq-server-154674858-master
Add DIST_PORT settings to Windows batch files
| -rw-r--r-- | scripts/rabbitmq-diagnostics.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 18 | ||||
| -rw-r--r-- | scripts/rabbitmq-plugins.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmqctl.bat | 2 |
4 files changed, 23 insertions, 1 deletions
diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 58b6c69e4f..311cfa3f5e 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
-nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 4e23cdcd0e..58aa5a2ce7 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -333,11 +333,27 @@ if "!ERL_CRASH_DUMP!"=="" ( )
REM [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-if "!$RABBITMQ_CTL_ERL_ARGS!"=="" (
+if "!RABBITMQ_CTL_ERL_ARGS!"=="" (
if not "!CTL_ERL_ARGS!"=="" (
set RABBITMQ_CTL_ERL_ARGS=!CTL_ERL_ARGS!
)
)
+if "!RABBITMQ_CTL_DIST_PORT_MIN!"=="" (
+ if not "!CTL_DIST_PORT_MIN!"=="" (
+ set RABBITMQ_CTL_DIST_PORT_MIN=!CTL_DIST_PORT_MIN!
+ )
+)
+if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
+ if not "!CTL_DIST_PORT_MAX!"=="" (
+ set RABBITMQ_CTL_DIST_PORT_MAX=!CTL_DIST_PORT_MAX!
+ )
+)
+if "!RABBITMQ_CTL_DIST_PORT_MIN!"=="" (
+ set /a RABBITMQ_CTL_DIST_PORT_MIN=10000+!RABBITMQ_DIST_PORT!
+)
+if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
+ set /a RABBITMQ_CTL_DIST_PORT_MAX=10010+!RABBITMQ_DIST_PORT!
+)
REM ADDITIONAL WINDOWS ONLY CONFIG ITEMS
REM rabbitmq-plugins.bat
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 443201e2f0..17471291cb 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
-nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 4980900f72..de94df6d57 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -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! ^
-sasl errlog_type error ^
-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
-nodename !RABBITMQ_NODENAME! ^
|