Add RABBITMQ_ prefix, and source /etc/default/rabbitmq. Update erlang code

for the new environment variable names.

9 files changed, 159 insertions, 124 deletions

diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-defaults b/packaging/macports/net/rabbitmq-server/files/rabbitmq-defaults
index 1f9aad11..aa162e61 100644
--- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-defaults
+++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-defaults
@@ -2,6 +2,6 @@
 # defaults file for rabbitmq-server
 #
 
-PIDS_FILE=@PREFIX@/var/lib/rabbitmq/pids
-LOG_BASE=@PREFIX@/var/log/rabbitmq
-MNESIA_BASE=@PREFIX@/var/lib/rabbitmq/mnesia
+RABBITMQ_PIDS_FILE=@PREFIX@/var/lib/rabbitmq/pids
+RABBITMQ_LOG_BASE=@PREFIX@/var/log/rabbitmq
+RABBITMQ_MNESIA_BASE=@PREFIX@/var/lib/rabbitmq/mnesia
diff --git a/packaging/windows/rabbitmq-service.pod b/packaging/windows/rabbitmq-service.pod
index 6a97c435..b60ec95b 100644
--- a/packaging/windows/rabbitmq-service.pod
+++ b/packaging/windows/rabbitmq-service.pod
@@ -63,7 +63,7 @@ type to B<Automatic> using the service control panel.
 
 =head1 ENVIRONMENT
 
-=head2 SERVICENAME
+=head2 RABBITMQ_SERVICENAME
 
 Defaults to RabbitMQ.
 This is the location of log and database directories.
@@ -73,21 +73,20 @@ This is the location of log and database directories.
 Defaults to the application data directory of the current user.
 This is the location of log and database directories.
 
-=head2 NODENAME
+=head2 RABBITMQ_NODENAME
 
-Defaults to "rabbit". This can be useful if you want to run more
-than one node per machine - B<NODENAME> should be unique per
+Defaults to "rabbit". This can be useful if you want to run more than
+one node per machine - B<RABBITMQ_NODENAME> should be unique per
 erlang-node-and-machine combination. See clustering on a single
-machine guide
-at L<http://www.rabbitmq.com/clustering.html#single-machine> for
-details. 
+machine guide at
+L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
 
-=head2 NODE_IP_ADDRESS
+=head2 RABBITMQ_NODE_IP_ADDRESS
 
 Defaults to "0.0.0.0". This can be changed if you only want to bind
 to one network interface. 
 
-=head2 NODE_PORT
+=head2 RABBITMQ_NODE_PORT
 
 Defaults to 5672. 
 
@@ -102,7 +101,7 @@ If this file is present it is used by the server to
 auto-configure a RabbitMQ cluster.  See the clustering guide
 at L<http://www.rabbitmq.com/clustering.html> for details.
 
-=head2 CONSOLE_LOG
+=head2 RABBITMQ_CONSOLE_LOG
 
 Set this varable to B<new> or B<reuse> to have the console 
 output from the server redirected to a file named B<SERVICENAME>.debug
@@ -110,11 +109,12 @@ in the  application data directory of the user that installed the service.
 Under Vista this will be F<C:\Documents and Settings\User\AppData\username\SERVICENAME>.
 Under previous versions of Windows this will be 
 F<C:\Documents and Settings\username\Application Data\SERVICENAME>.
-If B<CONSOLE_LOG> is set to B<new> then a new file will be created 
-each time the service starts. If B<CONSOLE_LOG> is set to B<reuse>
-then the file will be overwritten each time the service starts.
-The default behaviour when B<CONSOLE_LOG> is not set or set to a
-value other than B<new> or B<reuse> is to discard the server output.
+If B<RABBITMQ_CONSOLE_LOG> is set to B<new> then a new file will be
+created each time the service starts. If B<RABBITMQ_CONSOLE_LOG> is
+set to B<reuse> then the file will be overwritten each time the
+service starts.  The default behaviour when B<RABBITMQ_CONSOLE_LOG> is
+not set or set to a value other than B<new> or B<reuse> is to discard
+the server output.
 
 =head1 EXAMPLES
 
diff --git a/scripts/rabbitmq-mnesia-current b/scripts/rabbitmq-mnesia-current
index 45f1a845..fc500af9 100755
--- a/scripts/rabbitmq-mnesia-current
+++ b/scripts/rabbitmq-mnesia-current
@@ -24,27 +24,34 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-[ "x" = "x$NODENAME" ] && NODENAME=rabbit
-[ "x" = "x$NODE_IP_ADDRESS" ] && NODE_IP_ADDRESS=0.0.0.0
-[ "x" = "x$NODE_PORT" ] && NODE_PORT=5672
+. /etc/default/rabbitmq
 
-CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
+[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
+[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672
+[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
+[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq
+[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
+[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia
+[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
+[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
 
-[ "x" = "x$LOG_BASE" ] && LOG_BASE=/var/log/rabbitmq
-[ "x" = "x$MNESIA_BASE" ] && MNESIA_BASE=/var/lib/rabbitmq/mnesia
-[ "x" = "x$MNESIA_DIR" ] && MNESIA_DIR=${MNESIA_BASE}/${NODENAME}
-
-if [ -f "$CLUSTER_CONFIG_FILE" ]; then
-    CLUSTER_CONFIG="-rabbit cluster_config \"$CLUSTER_CONFIG_FILE\""
+if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then
+    RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\""
 else
-    CLUSTER_CONFIG=""
+    RABBITMQ_CLUSTER_CONFIG_OPTION=""
 fi
 
 exec erl \
     -pa "`dirname $0`/../ebin" \
     -noshell \
-    -sname ${NODENAME} \
+    -sname ${RABBITMQ_NODENAME} \
     -eval 'halt(case rabbit_mnesia:schema_current() of true -> 0; false -> 1 end).' \
-    -mnesia dir "\"${MNESIA_DIR}\"" \
+    -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
     -kernel error_logger '{file,"'/dev/null'"}' \
-    ${CLUSTER_CONFIG}
+    ${RABBITMQ_CLUSTER_CONFIG_OPTION}
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 5e4f4b38..4441ea8e 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -24,24 +24,36 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-[ "x" = "x$NODENAME" ] && NODENAME=rabbit
-[ "x" = "x$NODE_IP_ADDRESS" ] && NODE_IP_ADDRESS=0.0.0.0
-[ "x" = "x$NODE_PORT" ] && NODE_PORT=5672
+. /etc/default/rabbitmq
 
-ERL_ARGS=
-SCRIPT_HOME=$(dirname $0)
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672
+[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME}
+[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=$(dirname $0)
+[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
+[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=/var/lib/rabbitmq/pids
+[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS}
+[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=
+[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS}
+[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=
 
-[ "x" = "x$PIDS_FILE" ] && PIDS_FILE=/var/lib/rabbitmq/pids
-
-export NODENAME NODE_IP_ADDRESS NODE_PORT SCRIPT_HOME PIDS_FILE
+export \
+    RABBITMQ_NODENAME \
+    RABBITMQ_NODE_IP_ADDRESS \
+    RABBITMQ_NODE_PORT \
+    RABBITMQ_SCRIPT_HOME \
+    RABBITMQ_PIDS_FILE
 
 exec erl \
     -pa "`dirname $0`/../ebin" \
     -noinput \
     -hidden \
-    ${ERL_ARGS} \
+    ${RABBITMQ_MULTI_ERL_ARGS} \
     -sname rabbitmq_multi$$ \
     -s rabbit_multi \
-    ${START_ARGS} \
+    ${RABBITMQ_MULTI_START_ARGS} \
     -extra "$@"
-
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 819c99af..a05f19eb 100644..100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -28,20 +28,20 @@ if "%RABBITMQ_BASE%"=="" (
     set RABBITMQ_BASE=%APPDATA%\RabbitMQ

 )

 

-if "%NODENAME%"=="" (

-    set NODENAME=rabbit

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

+    set RABBITMQ_NODENAME=rabbit

 )

 

-if "%NODE_IP_ADDRESS%"=="" (

-    set NODE_IP_ADDRESS=0.0.0.0

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

+    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

 )

 

-if "%NODE_PORT%"=="" (

-    set NODE_PORT=5672

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

+    set RABBITMQ_NODE_PORT=5672

 )

 

-set PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

-set SCRIPT_HOME=%~dp0%

+set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

+set RABBITMQ_SCRIPT_HOME=%~dp0%

 

 if "%ERLANG_HOME%"=="" (

     set ERLANG_HOME=%~dp0%..\..\..

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 1ce5458e..ab97c3ed 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -24,54 +24,67 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-[ "x" = "x$NODENAME" ] && NODENAME=rabbit
-[ "x" = "x$NODE_IP_ADDRESS" ] && NODE_IP_ADDRESS=0.0.0.0
-[ "x" = "x$NODE_PORT" ] && NODE_PORT=5672
+. /etc/default/rabbitmq
 
-ERL_ARGS="+K true +A30 \
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
+[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672
+[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_ERL_ARGS=${SERVER_ERL_ARGS}
+[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_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/default/rabbitmq_cluster.config
-
-[ "x" = "x$LOG_BASE" ] && LOG_BASE=/var/log/rabbitmq
-[ "x" = "x$MNESIA_BASE" ] && MNESIA_BASE=/var/lib/rabbitmq/mnesia
-[ "x" = "x$MNESIA_DIR" ] && MNESIA_DIR=${MNESIA_BASE}/${NODENAME}
-[ "x" = "x$NODE_ONLY" ] && START_RABBIT='-noinput -s rabbit'
+[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
+[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
+[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
+[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq
+[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
+[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia
+[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
+[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
+[ "x" = "x$RABBITMQ_START_RABBIT" ] && RABBITMQ_START_RABBIT=${START_RABBIT}
+[ "x" = "x$RABBITMQ_START_RABBIT" ] && RABBITMQ_START_RABBIT='-noinput -s rabbit'
+[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS}
+[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=
 
 ## Log rotation
-LOGS="${LOG_BASE}/${NODENAME}.log"
-SASL_LOGS="${LOG_BASE}/${NODENAME}-sasl.log"
-BACKUP_EXTENSION=".1"
+[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS}
+[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log"
+[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS}
+[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log"
+[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=${BACKUP_EXTENSION}
+[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=".1"
 
-[ -f  "${LOGS}" ] && cat "${LOGS}" >> "${LOGS}${BACKUP_EXTENSION}"
-[ -f  "${SASL_LOGS}" ] && cat "${SASL_LOGS}" >> "${SASL_LOGS}${BACKUP_EXTENSION}"
+[ -f  "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
+[ -f  "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
 
-if [ -f "$CLUSTER_CONFIG_FILE" ]; then
-    CLUSTER_CONFIG="-rabbit cluster_config \"$CLUSTER_CONFIG_FILE\""
+if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then
+    RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\""
 else
-    CLUSTER_CONFIG=""
+    RABBITMQ_CLUSTER_CONFIG_OPTION=""
 fi
 
 exec erl \
     -pa "`dirname $0`/../ebin" \
-    ${START_RABBIT} \
-    -sname ${NODENAME} \
+    ${RABBITMQ_START_RABBIT} \
+    -sname ${RABBITMQ_NODENAME} \
     -boot start_sasl \
     +W w \
-    ${ERL_ARGS} \
-    -rabbit tcp_listeners '[{"'${NODE_IP_ADDRESS}'", '${NODE_PORT}'}]' \
+    ${RABBITMQ_SERVER_ERL_ARGS} \
+    -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \
     -sasl errlog_type error \
-    -kernel error_logger '{file,"'${LOGS}'"}' \
-    -sasl sasl_error_logger '{file,"'${SASL_LOGS}'"}' \
+    -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
+    -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
     -os_mon start_cpu_sup true \
     -os_mon start_disksup false \
     -os_mon start_memsup false \
     -os_mon start_os_sup false \
     -os_mon memsup_system_only true \
     -os_mon system_memory_high_watermark 0.95 \
-    -mnesia dir "\"${MNESIA_DIR}\"" \
-    ${CLUSTER_CONFIG} \
-    ${RABBIT_ARGS} \
+    -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
+    ${RABBITMQ_CLUSTER_CONFIG_OPTION} \
+    ${RABBITMQ_SERVER_START_ARGS} \
     "$@"
 
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 4b9cc452..7b47f2b2 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -24,24 +24,24 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

-if "%SERVICENAME%"=="" (

-    set SERVICENAME=RabbitMQ

+if "%RABBITMQ_SERVICENAME%"=="" (

+    set RABBITMQ_SERVICENAME=RabbitMQ

 )

 

 if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\%SERVICENAME%

+    set RABBITMQ_BASE=%APPDATA%\%RABBITMQ_SERVICENAME%

 )

 

-if "%NODENAME%"=="" (

-    set NODENAME=rabbit

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

+    set RABBITMQ_NODENAME=rabbit

 )

 

-if "%NODE_IP_ADDRESS%"=="" (

-    set NODE_IP_ADDRESS=0.0.0.0

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

+    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

 )

 

-if "%NODE_PORT%"=="" (

-    set NODE_PORT=5672

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

+    set RABBITMQ_NODE_PORT=5672

 )

 

 if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

@@ -50,9 +50,9 @@ if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (
 

 set CONSOLE_FLAG=

 set CONSOLE_LOG_VALID=

-for %%i in (new reuse) do if "%%i" == "%CONSOLE_LOG%" set CONSOLE_LOG_VALID=TRUE

+for %%i in (new reuse) do if "%%i" == "%RABBITMQ_CONSOLE_LOG%" set CONSOLE_LOG_VALID=TRUE

 if "%CONSOLE_LOG_VALID%" == "TRUE" (

-    set CONSOLE_FLAG=-debugtype %CONSOLE_LOG%

+    set CONSOLE_FLAG=-debugtype %RABBITMQ_CONSOLE_LOG%

 )

 

 rem *** End of configuration ***

@@ -80,11 +80,11 @@ rem Log management (rotation, filtering based on size...) is left as an exercise
 

 set BACKUP_EXTENSION=.1

 

-set LOGS="%RABBITMQ_BASE%\log\%NODENAME%.log"

-set SASL_LOGS="%RABBITMQ_BASE%\log\%NODENAME%-sasl.log"

+set LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log"

+set SASL_LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log"

 

-set LOGS_BACKUP="%RABBITMQ_BASE%\log\%NODENAME%.log%BACKUP_EXTENSION%"

-set SASL_LOGS_BACKUP="%RABBITMQ_BASE%\log\%NODENAME%-sasl.log%BACKUP_EXTENSION%"

+set LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%"

+set SASL_LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%"

 

 if exist %LOGS% (

 	type %LOGS% >> %LOGS_BACKUP%

@@ -96,13 +96,15 @@ if exist %SASL_LOGS% (
 rem End of log management

 

 

-set CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+)

 set CLUSTER_CONFIG=

-if not exist "%CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

 :L1

 

-set MNESIA_DIR=%MNESIA_BASE%/%NODENAME%-mnesia

+set MNESIA_DIR=%MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

 

 

 if "%1" == "install" goto INSTALL_SERVICE

@@ -114,16 +116,16 @@ echo Service control usage
 echo *********************

 echo.

 echo %~n0 help    - Display this help

-echo %~n0 install - Install the %SERVICENAME% service

-echo %~n0 remove  - Remove the %SERVICENAME% service

+echo %~n0 install - Install the %RABBITMQ_SERVICENAME% service

+echo %~n0 remove  - Remove the %RABBITMQ_SERVICENAME% service

 echo.

 echo The following actions can also be accomplished by using 

 echo Windows Services Management Console (services.msc):

 echo.

-echo %~n0 start   - Start the %SERVICENAME% service

-echo %~n0 stop    - Stop the %SERVICENAME% service

-echo %~n0 disable - Disable the %SERVICENAME% service

-echo %~n0 enable  - Enable the %SERVICENAME% service

+echo %~n0 start   - Start the %RABBITMQ_SERVICENAME% service

+echo %~n0 stop    - Stop the %RABBITMQ_SERVICENAME% service

+echo %~n0 disable - Disable the %RABBITMQ_SERVICENAME% service

+echo %~n0 enable  - Enable the %RABBITMQ_SERVICENAME% service

 echo.

 exit /B

 

@@ -134,11 +136,11 @@ if not exist "%RABBITMQ_BASE%" (
     echo Creating base directory %RABBITMQ_BASE% & md "%RABBITMQ_BASE%" 

 )

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" list %SERVICENAME% 2>NUL 1>NUL

+"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" list %RABBITMQ_SERVICENAME% 2>NUL 1>NUL

 if errorlevel 1 (

-    "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" add %SERVICENAME%

+    "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" add %RABBITMQ_SERVICENAME%

 ) else (

-    echo %SERVICENAME% service is already present - only updating service parameters

+    echo %RABBITMQ_SERVICENAME% service is already present - only updating service parameters

 )

 

 set RABBIT_EBIN=%~dp0..\ebin

@@ -151,10 +153,10 @@ 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 "[{\"%NODE_IP_ADDRESS%\",%NODE_PORT%}]" ^

--kernel error_logger {file,\""%LOG_BASE%/%NODENAME%.log"\"} ^

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

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

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%LOG_BASE%/%NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""%LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup true ^

@@ -169,12 +171,12 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:\=\\%

 set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:"=\"%

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" set %SERVICENAME% ^

+"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" set %RABBITMQ_SERVICENAME% ^

 -machine "%ERLANG_SERVICE_MANAGER_PATH%\erl.exe" ^

 -env ERL_CRASH_DUMP="%RABBITMQ_BASE_UNIX%/log" ^

 -workdir "%RABBITMQ_BASE%" ^

 -stopaction "rabbit:stop_and_halt()." ^

--sname %NODENAME% ^

+-sname %RABBITMQ_NODENAME% ^

 %CONSOLE_FLAG% ^

 -args "%ERLANG_SERVICE_ARGUMENTS%" > NUL

 goto END

@@ -182,7 +184,7 @@ goto END
 

 :MODIFY_SERVICE

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" %1 %SERVICENAME%

+"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" %1 %RABBITMQ_SERVICENAME%

 goto END

 

 

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index b821fa0d..aebf46db 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -116,11 +116,12 @@ Available commands:
 Quiet output mode is selected with the \"-q\" flag. Informational messages
 are suppressed when quiet mode is in effect.
 
-<node> should be the name of the master node of the RabbitMQ cluster. It
-defaults to the node named \"rabbit\" on the local host. On a host named
-\"server.example.com\", the master node will usually be rabbit@server (unless
-NODENAME has been set to some non-default value at broker startup time). The
-output of hostname -s is usually the correct suffix to use after the \"@\" sign.
+<node> should be the name of the master node of the RabbitMQ
+cluster. It defaults to the node named \"rabbit\" on the local
+host. On a host named \"server.example.com\", the master node will
+usually be rabbit@server (unless RABBITMQ_NODENAME has been set to
+some non-default value at broker startup time). The output of hostname
+-s is usually the correct suffix to use after the \"@\" sign.
 
 "),
     halt(1).
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index b99dfbc1..84f8642f 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -84,8 +84,8 @@ action(start_all, [NodeCount], RpcTimeout) ->
     io:format("Starting all nodes...~n", []),
     N = list_to_integer(NodeCount),
     {NodePids, Running} = start_nodes(N, N, [], true,
-                                      getenv("NODENAME"),
-                                      getenv("NODE_PORT"),
+                                      getenv("RABBITMQ_NODENAME"),
+                                      getenv("RABBITMQ_NODE_PORT"),
                                       RpcTimeout),
     write_pids_file(NodePids),
     case Running of
@@ -155,8 +155,8 @@ start_nodes(N, Total, PNodePid, Running,
                 NodeNameBase, NodePortBase, RpcTimeout).
 
 start_node(NodeName, NodePort, RpcTimeout) ->
-    os:putenv("NODENAME", NodeName),
-    os:putenv("NODE_PORT", integer_to_list(NodePort)),
+    os:putenv("RABBITMQ_NODENAME", NodeName),
+    os:putenv("RABBITMQ_NODE_PORT", integer_to_list(NodePort)),
     Node = rabbit_misc:localnode(list_to_atom(NodeName)),
     io:format("Starting node ~s...~n", [Node]),
     case rpc:call(Node, os, getpid, []) of
@@ -213,13 +213,13 @@ with_os(Handlers) ->
     end.
 
 script_filename() ->
-    ScriptHome = getenv("SCRIPT_HOME"),
+    ScriptHome = getenv("RABBITMQ_SCRIPT_HOME"),
     ScriptName = with_os(
                    [{unix , fun () -> "rabbitmq-server" end},
                     {win32, fun () -> "rabbitmq-server.bat" end}]),
     ScriptHome ++ "/" ++ ScriptName ++ " -noinput".
 
-pids_file() -> getenv("PIDS_FILE").
+pids_file() -> getenv("RABBITMQ_PIDS_FILE").
 
 write_pids_file(Pids) ->
     FileName = pids_file(),