Default merged into bug21457

4 files changed, 26 insertions, 3 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 7019cd136a..1eefd702dd 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -37,6 +37,7 @@ SERVER_ERL_ARGS="+K true +A30 \
 -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
 -kernel inet_default_connect_options [{nodelay,true}]"
 CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
+CONFIG_FILE=/etc/rabbitmq/rabbitmq
 LOG_BASE=/var/log/rabbitmq
 MNESIA_BASE=/var/lib/rabbitmq/mnesia
 SERVER_START_ARGS=
@@ -48,6 +49,7 @@ SERVER_START_ARGS=
 [ "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}
 [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
 [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS}
@@ -74,7 +76,6 @@ fi
 
 RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' 
-[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="${RABBITMQ_START_RABBIT} -s rabbit"
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
@@ -83,7 +84,10 @@ if [ -f "${RABBITMQ_EBIN_ROOT}/rabbit.boot" ] && [ "x" = "x$RABBITMQ_NODE_ONLY"
 else
     RABBITMQ_BOOT_FILE=start_sasl
     RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}"
+    [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="${RABBITMQ_START_RABBIT} -s rabbit"
 fi
+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_SERVER_ERL_ARGS, contain terms that look like globs and
@@ -95,6 +99,7 @@ exec erl \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
     -boot ${RABBITMQ_BOOT_FILE} \
+    ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
     -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 6439baeb32..977036d0c3 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -109,11 +109,20 @@ if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (
     set RABBITMQ_BOOT_FILE=start_sasl

     set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

 )

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

+)

 

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

 %RABBITMQ_EBIN_PATH% ^

 -noinput ^

--boot %RABBITMQ_BOOT_FILE% ^

+-boot %RABBITMQ_BOOT_FILE% %RABBITMQ_CONFIG_ARG% ^

 -sname %RABBITMQ_NODENAME% ^

 -s rabbit ^

 +W w ^

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 9c45e73dd5..a332afc6ca 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -30,8 +30,11 @@
 ##   Contributor(s): ______________________________________.
 ##
 
+NODENAME=rabbit
+
 . `dirname $0`/rabbitmq-env
 
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
 
 exec erl \
@@ -41,4 +44,6 @@ exec erl \
     ${RABBITMQ_CTL_ERL_ARGS} \
     -sname rabbitmqctl$$ \
     -s rabbit_control \
+    -nodename $RABBITMQ_NODENAME \
     -extra "$@"
+	
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 5111724f7d..8a4e5445e5 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -30,6 +30,10 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+if "%RABBITMQ_NODENAME%"=="" (

+    set RABBITMQ_NODENAME=rabbit

+)

+

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

     echo.

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

@@ -42,4 +46,4 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -extra %*

+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -nodename %RABBITMQ_NODENAME% -extra %*