summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2015-01-29 13:02:23 +0000
committerSimon MacMullen <simon@rabbitmq.com>2015-01-29 13:02:23 +0000
commit05ceeb0361ec032f8653e1b2266acf357fd61f01 (patch)
treed188f0241a368fdcb235de487166b5aa0f90ad8d /scripts
parentd6453f1d044ac944eeec2b8b3196b79497b528f2 (diff)
parentcc040e95d6ee7e0703547338848c2849b39e59ec (diff)
downloadrabbitmq-server-git-05ceeb0361ec032f8653e1b2266acf357fd61f01.tar.gz
Merge bug26558
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-plugins1
-rwxr-xr-xscripts/rabbitmq-plugins.bat12
2 files changed, 12 insertions, 1 deletions
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index 29c4b0c86a..84ed9fdc53 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -23,6 +23,7 @@ exec ${ERL_DIR}erl \
-pa "${RABBITMQ_HOME}/ebin" \
-noinput \
-hidden \
+ ${RABBITMQ_PLUGINS_ERL_ARGS} \
${RABBITMQ_NAME_TYPE} rabbitmq-plugins$$ \
-boot "${CLEAN_BOOT_FILE}" \
-s rabbit_plugins_main \
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 1ed648b0bc..8a3c1f330f 100755
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -63,7 +63,17 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
)
-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_NAME_TYPE! rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!
+"!ERLANG_HOME!\bin\erl.exe" ^
+-pa "!TDP0!..\ebin" ^
+-noinput ^
+-hidden ^
+!RABBITMQ_CTL_ERL_ARGS! ^
+!RABBITMQ_NAME_TYPE! rabbitmq-plugins!RANDOM!!TIME:~9! ^
+-s rabbit_plugins_main ^
+-enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
+-plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" ^
+-nodename !RABBITMQ_NODENAME! ^
+-extra !STAR!
endlocal
endlocal