diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-06-19 16:36:45 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-06-19 16:36:45 +0200 |
| commit | b806315ab13a95a7280bb0087ef1bfd4d3c96749 (patch) | |
| tree | 89d815f8e475e20086530882d097c6614fdcbabf | |
| parent | e61c608380e9bd3dba2c2fe5656c19c69e130525 (diff) | |
| download | rabbitmq-server-git-b806315ab13a95a7280bb0087ef1bfd4d3c96749.tar.gz | |
scripts/rabbitmq-service.bat: Configure Erlang distribution port
As said in the comment, this is normally done at runtime now (see
rabbitmq/rabbitmq-server#2180). However, we must configure the
distribution on the command line specifically for the Windows service.
Until this patch, the distribution was enabled with the correct
nodename, but the TCP port configuration was not set. This caused a
regression because the selected TCP port was random instead of the
expected default of 25672.
This patch restores the previous behavior.
Fixes rabbitmq/rabbitmq-server#2387.
| -rw-r--r-- | scripts/rabbitmq-service.bat | 28 |
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!
|