summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2020-06-24 00:13:16 +0300
committerGitHub <noreply@github.com>2020-06-24 00:13:16 +0300
commit355b2b56f0f5252df4a9004e3a8d6aa505315fed (patch)
tree384d364b740e4c1712a133dfc19d58034588995a /scripts
parent84442c437f22ba4d8f28613cec8393191a1790a6 (diff)
parentb806315ab13a95a7280bb0087ef1bfd4d3c96749 (diff)
downloadrabbitmq-server-git-355b2b56f0f5252df4a9004e3a8d6aa505315fed.tar.gz
Merge pull request #2389 from rabbitmq/restore-dist-port-configuration-for-windows-service
scripts/rabbitmq-service.bat: Configure Erlang distribution port
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rabbitmq-service.bat28
1 files changed, 28 insertions, 0 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 22e71bf4ab..48d90c4c4f 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -67,6 +67,33 @@ if "!RABBITMQ_NODENAME!"=="" (
)
set NAMETYPE=
+REM Set Erlang distribution port, based on the AMQP TCP port.
+REM
+REM We do this only for the Windows service because in this case, the node has
+REM to start with the distribution enabled on the command lind. For all other
+REM cases, distribution is configured at runtime.
+if "!RABBITMQ_NODE_PORT!"=="" (
+ if not "!NODE_PORT!"=="" (
+ set RABBITMQ_NODE_PORT=!NODE_PORT!
+ ) else (
+ set RABBITMQ_NODE_PORT=5672
+ )
+)
+
+if "!RABBITMQ_DIST_PORT!"=="" (
+ if "!DIST_PORT!"=="" (
+ if "!RABBITMQ_NODE_PORT!"=="" (
+ set RABBITMQ_DIST_PORT=25672
+ ) else (
+ set /a RABBITMQ_DIST_PORT=20000+!RABBITMQ_NODE_PORT!
+ )
+ ) else (
+ set RABBITMQ_DIST_PORT=!DIST_PORT!
+ )
+)
+
+set RABBITMQ_DIST_ARG=-kernel inet_dist_listen_min !RABBITMQ_DIST_PORT! -kernel inet_dist_listen_max !RABBITMQ_DIST_PORT!
+
set STARVAR=
shift
:loop1
@@ -184,6 +211,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
!RABBITMQ_SERVER_ERL_ARGS! ^
!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^
!RABBITMQ_SERVER_START_ARGS! ^
+!RABBITMQ_DIST_ARG! ^
-lager crash_log false ^
-lager handlers "[]" ^
!STARVAR!