Reintroduced traces of tcp_listeners where it turns out to be a jolly good idea, but don't set either one unless the other has been set. Thus if neither has been set then we don't do nowt.

5 files changed, 76 insertions, 1 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 73502ec2..d8b0f074 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -30,6 +30,8 @@
 ##   Contributor(s): ______________________________________.
 ##
 NODENAME=rabbit
+NODE_IP_ADDRESS=0.0.0.0
+NODE_PORT=5672
 SCRIPT_HOME=$(dirname $0)
 PIDS_FILE=/var/lib/rabbitmq/pids
 MULTI_ERL_ARGS=
@@ -37,6 +39,16 @@ MULTI_START_ARGS=
 
 . `dirname $0`/rabbitmq-env
 
+if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
+then
+    if [ "x" != "x$RABBITMQ_NODE_PORT" ]
+    then RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+    fi
+else
+    if [ "x" = "x$RABBITMQ_NODE_PORT" ]
+    then RABBITMQ_NODE_PORT=${NODE_PORT}
+    fi
+fi
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME}
 [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
@@ -45,6 +57,8 @@ MULTI_START_ARGS=
 
 export \
     RABBITMQ_NODENAME \
+    RABBITMQ_NODE_IP_ADDRESS \
+    RABBITMQ_NODE_PORT \
     RABBITMQ_SCRIPT_HOME \
     RABBITMQ_PIDS_FILE
 
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 0d814d92..9f134f17 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -40,6 +40,16 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

+if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

+   if not "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+   )

+) else (

+   if "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_PORT=5672

+   )

+)

+

 set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

 set RABBITMQ_SCRIPT_HOME=%~sdp0%

 

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 693b0f52..8ba7d6b8 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -31,6 +31,8 @@
 ##
 
 NODENAME=rabbit
+NODE_IP_ADDRESS=0.0.0.0
+NODE_PORT=5672
 SERVER_ERL_ARGS="+K true +A30 \
 -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
 -kernel inet_default_connect_options [{nodelay,true}]"
@@ -42,6 +44,17 @@ SERVER_START_ARGS=
 
 . `dirname $0`/rabbitmq-env
 
+
+if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
+then
+    if [ "x" != "x$RABBITMQ_NODE_PORT" ]
+    then RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+    fi
+else
+    if [ "x" = "x$RABBITMQ_NODE_PORT" ]
+    then RABBITMQ_NODE_PORT=${NODE_PORT}
+    fi
+fi
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}
 [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
@@ -85,6 +98,9 @@ fi
 RABBITMQ_CONFIG_ARG=
 [ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
 
+RABBITMQ_LISTEN_ARG=
+[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]'"
+
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and
 # there is no other way of preventing their expansion.
@@ -98,6 +114,7 @@ exec erl \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
+    ${RABBITMQ_LISTEN_ARG} \
     -sasl errlog_type error \
     -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
     -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index cad8e978..42ed185f 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -40,6 +40,16 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

+if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

+   if not "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+   )

+) else (

+   if "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_PORT=5672

+   )

+)

+

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

@@ -113,6 +123,13 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
     set RABBITMQ_CONFIG_ARG=

 )

 

+set RABBITMQ_LISTEN_ARG=

+if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

+   if not "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]"

+   )

+)

+

 "%ERLANG_HOME%\bin\erl.exe" ^

 %RABBITMQ_EBIN_PATH% ^

 -noinput ^

@@ -124,6 +141,7 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
 +A30 ^

 -kernel inet_default_listen_options "[{nodelay, true}, {sndbuf, 16384}, {recbuf, 4096}]" ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

+%RABBITMQ_LISTEN_ARG% ^

 -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

 %RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 5abec51c..d960d29d 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -44,6 +44,16 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

+if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

+   if not "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+   )

+) else (

+   if "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_NODE_PORT=5672

+   )

+)

+

 if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

     set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

 )

@@ -169,7 +179,12 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
     set RABBITMQ_CONFIG_ARG=

 )

 

-

+set RABBITMQ_LISTEN_ARG=

+if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

+   if not "%RABBITMQ_NODE_PORT%"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]"

+   )

+)

 

 set ERLANG_SERVICE_ARGUMENTS= ^

 %RABBITMQ_EBIN_PATH% ^

@@ -180,6 +195,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 +A30 ^

 -kernel inet_default_listen_options "[{nodelay,true},{sndbuf,16384},{recbuf,4096}]" ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

+%RABBITMQ_LISTEN_ARG% ^

 -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

 %RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^