summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2010-09-16 16:18:36 +0100
committerEmile Joubert <emile@rabbitmq.com>2010-09-16 16:18:36 +0100
commit4475eeaffc8efa5448bc37b51876bd85c2b56fe8 (patch)
tree4900464e9c025af6e6c98928fd99802400e4823b /scripts
parent042d2778378568b4d4092d29f09fe473ae7ee18b (diff)
downloadrabbitmq-server-git-4475eeaffc8efa5448bc37b51876bd85c2b56fe8.tar.gz
Avoid starting rabbit app on plugin activation
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server5
-rw-r--r--scripts/rabbitmq-server.bat6
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 9310752f6f..92ce32094d 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -88,13 +88,10 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
if erl \
-pa "$RABBITMQ_EBIN_ROOT" \
- -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
- -rabbit plugins_expand_dir "\"${RABBITMQ_MNESIA_DIR}/plugins-scratch\"" \
- -rabbit rabbit_ebin "\"$RABBITMQ_EBIN_ROOT\"" \
-noinput \
-hidden \
-s rabbit_plugin_activator \
- -extra "$@"
+ -extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_MNESIA_DIR}/plugins-scratch"
then
RABBITMQ_BOOT_FILE="${RABBITMQ_MNESIA_DIR}/plugins-scratch/rabbit"
RABBITMQ_EBIN_PATH=""
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5bcbc6babd..4d90d90c42 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -114,10 +114,8 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
-pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput -hidden ^
-s rabbit_plugin_activator ^
--rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^
--rabbit plugins_expand_dir \""!RABBITMQ_MNESIA_DIR:\=/!/plugins-scratch"\" ^
--rabbit rabbit_ebin \""!RABBITMQ_EBIN_ROOT:\=/!"\" ^
--extra !STAR!
+-extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^
+ "!RABBITMQ_MNESIA_DIR:\=/!/plugins-scratch"
set RABBITMQ_BOOT_FILE=!RABBITMQ_MNESIA_DIR!\plugins-scratch\rabbit
if not exist "!RABBITMQ_BOOT_FILE!.boot" (