Merge default into bug22068

5 files changed, 82 insertions, 27 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 7db4cb70b2..1a7eb97e08 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -36,23 +36,37 @@ SCRIPT_HOME=$(dirname $0)
 PIDS_FILE=/var/lib/rabbitmq/pids
 MULTI_ERL_ARGS=
 MULTI_START_ARGS=
+CONFIG_FILE=/etc/rabbitmq/rabbitmq
 
 . `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_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME}
 [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
 [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS}
 [ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS}
+[ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
 
 export \
     RABBITMQ_NODENAME \
     RABBITMQ_NODE_IP_ADDRESS \
     RABBITMQ_NODE_PORT \
     RABBITMQ_SCRIPT_HOME \
-    RABBITMQ_PIDS_FILE
+    RABBITMQ_PIDS_FILE \
+    RABBITMQ_CONFIG_FILE
+
+RABBITMQ_CONFIG_ARG=
+[ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
 
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_MULTI_ERL_ARGS, may contain terms that look like globs and
@@ -65,6 +79,7 @@ exec erl \
     -hidden \
     ${RABBITMQ_MULTI_ERL_ARGS} \
     -sname rabbitmq_multi$$ \
+    ${RABBITMQ_CONFIG_ARG} \
     -s rabbit_multi \
     ${RABBITMQ_MULTI_START_ARGS} \
     -extra "$@"
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 8de18405b7..6dda13af37 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -41,20 +41,32 @@ if "%RABBITMQ_NODENAME%"=="" (
 )

 

 if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

+   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%

 

+if "%RABBITMQ_CONFIG_FILE%"=="" (

+    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+)

+

+if exist "%RABBITMQ_CONFIG_FILE%.config" (

+    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+) else (

+    set RABBITMQ_CONFIG_ARG=

+)

+

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

     echo.

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

-    echo ERLANG_HOME not set correctly. 

+    echo ERLANG_HOME not set correctly.

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

     echo.

     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

@@ -68,6 +80,7 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
 -noinput -hidden ^

 %RABBITMQ_MULTI_ERL_ARGS% ^

 -sname rabbitmq_multi ^

+%RABBITMQ_CONFIG_ARG% ^

 -s rabbit_multi ^

 %RABBITMQ_MULTI_START_ARGS% ^

 -extra %*

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 310afe9426..7f08cd9d75 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -44,9 +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_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 [ "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}
 [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
@@ -89,6 +97,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.
@@ -102,7 +113,7 @@ exec erl \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
-    -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \
+    ${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 211fc78190..5110285128 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -41,17 +41,19 @@ if "%RABBITMQ_NODENAME%"=="" (
 )

 

 if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

+   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 ******************************

-    echo ERLANG_HOME not set correctly. 

+    echo ERLANG_HOME not set correctly.

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

     echo.

     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

@@ -114,13 +116,20 @@ if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (
 if "%RABBITMQ_CONFIG_FILE%"=="" (

     set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

 )

-   

+

 if exist "%RABBITMQ_CONFIG_FILE%.config" (

     set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

 ) else (

     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 ^

@@ -132,7 +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}]" ^

--rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]" ^

+%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 d80df9677f..d960d29dea 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -45,11 +45,13 @@ if "%RABBITMQ_NODENAME%"=="" (
 )

 

 if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

+   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%"=="" (

@@ -177,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% ^

@@ -188,7 +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}]" ^

--rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\",%RABBITMQ_NODE_PORT%}]" ^

+%RABBITMQ_LISTEN_ARG% ^

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

 %RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^