diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-11-03 09:48:42 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-11-03 09:48:42 +0000 |
| commit | 89fcddb7e956f077169947c2abe8a13ea7337fc0 (patch) | |
| tree | 260b51c5f7a801209d6b65dba8057cafde9ac008 /src | |
| parent | 02baf503d3404fac02321a0d5ce7b1040036c584 (diff) | |
| parent | d59dde5408c2cc7b2f014cf8c26d4f0063ec2b3b (diff) | |
| download | rabbitmq-server-git-89fcddb7e956f077169947c2abe8a13ea7337fc0.tar.gz | |
Merged default into bug23186
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugin_activator.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index ef81ddf23a..072f297e69 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -50,13 +50,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 - {ok, PluginDir} = application:get_env(rabbit, plugins_dir), - {ok, UnpackedPluginDir} = application:get_env(rabbit, plugins_expand_dir), - + [PluginDir, UnpackedPluginDir] = init:get_plain_arguments(), RootName = UnpackedPluginDir ++ "/rabbit", %% Unpack any .ez plugins |