diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-07-02 03:33:04 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-07-02 03:33:04 +0300 |
| commit | 61036f00cb0cc4f390f5e6bec91fdaf969060141 (patch) | |
| tree | 476a9d73d5305bfaf69b6951d01a44beca07f6bd /scripts | |
| parent | 4d5e06aac3cfd82d9101fd71c40d2fdb2f130b3f (diff) | |
| download | rabbitmq-server-git-61036f00cb0cc4f390f5e6bec91fdaf969060141.tar.gz | |
Introduce BOOT_MODULE in Windows batch scripts
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 11 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 2 |
3 files changed, 14 insertions, 3 deletions
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.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.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" ^
|