summaryrefslogtreecommitdiff
path: root/src
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 /src
parent042d2778378568b4d4092d29f09fe473ae7ee18b (diff)
downloadrabbitmq-server-git-4475eeaffc8efa5448bc37b51876bd85c2b56fe8.tar.gz
Avoid starting rabbit app on plugin activation
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_plugin_activator.erl6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl
index b23776cd74..3d9a8a9572 100644
--- a/src/rabbit_plugin_activator.erl
+++ b/src/rabbit_plugin_activator.erl
@@ -52,13 +52,9 @@
start() ->
io:format("Activating RabbitMQ plugins ...~n"),
- %% Ensure Rabbit is loaded so we can access it's environment
- application:load(rabbit),
%% Determine our various directories
- PluginDir = get_env(plugins_dir, ?DefaultPluginDir),
- UnpackedPluginDir = get_env(plugins_expand_dir, ?DefaultUnpackedPluginDir),
-
+ [PluginDir, UnpackedPluginDir] = init:get_plain_arguments(),
RootName = UnpackedPluginDir ++ "/rabbit",
%% Unpack any .ez plugins