Merge pull request #209 from rabbitmq/rabbitmq-server-208

Make boot module configurable via env variable

6 files changed, 19 insertions, 4 deletions

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index 1cf9152afb..9ee5127f5a 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -26,6 +26,8 @@ SASL_BOOT_FILE=start_sasl
 
 ## Set default values
 
+BOOT_MODULE="rabbit"
+
 CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
 LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index f1544d0bcd..d3983f22cf 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -17,10 +17,12 @@ if "!RABBITMQ_BASE!"=="" (
     set RABBITMQ_BASE=!APPDATA!\RabbitMQ
 )
 
+REM BOOT_MODULE="rabbit"
 REM CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
 REM LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 REM MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
 REM ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
+set BOOT_MODULE=rabbit
 set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq
 set LOG_BASE=!RABBITMQ_BASE!\log
 set MNESIA_BASE=!RABBITMQ_BASE!\db
@@ -32,4 +34,4 @@ set PLUGINS_DIR=!TDP0!..\plugins
 REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf
 if "!RABBITMQ_CONF_ENV_FILE!"=="" (
     set CONF_ENV_FILE=!APPDATA!\RabbitMQ\rabbitmq-env-conf.bat
-)
\ No newline at end of file
+)
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index eede788a93..43ff3abdd8 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -152,6 +152,8 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE}
 [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid
 
+[ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE}
+
 [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}
 [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand
 
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 7b042d8e26..77bcd65b73 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -201,6 +201,15 @@ REM [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE}
 REM [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid
 REM No Windows equivalent
 
+REM [ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE}
+if "!RABBITMQ_BOOT_MODULE!"=="" (
+	if "!BOOT_MODULE!"=="" (
+		set RABBITMQ_BOOT_MODULE=rabbit
+	) else (
+		set RABBITMQ_BOOT_MODULE=!BOOT_MODULE!
+	)
+)
+
 REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}
 REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand
 if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" (
@@ -274,4 +283,4 @@ if "!RABBITMQ_SERVICENAME!"=="" (
 REM ##--- End of overridden <var_name> variables
 REM 
 REM # Since we source this elsewhere, don't accidentally stop execution
-REM true
\ No newline at end of file
+REM true
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index a6f4be9902..bd72ba6caa 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -21,7 +21,7 @@
 
 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 boot "
+[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s $RABBITMQ_BOOT_MODULE boot "
 
 case "$(uname -s)" in
   CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 9b334a5a13..d866279782 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -73,7 +73,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 

 set RABBITMQ_START_RABBIT=

 if "!RABBITMQ_NODE_ONLY!"=="" (

-    set RABBITMQ_START_RABBIT=-s rabbit boot

+    set RABBITMQ_START_RABBIT=-s "!RABBITMQ_BOOT_MODULE!" boot

 )

 

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