diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2010-11-02 11:16:18 +0000 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2010-11-02 11:16:18 +0000 |
| commit | 0bd30c535063a2121e82eb7b26b2ecc1d042baa4 (patch) | |
| tree | 111ed42c3bc55b0d3af909b87e46522ab43f035b /src | |
| parent | 603e852eea3ce8802f51bb8842df3f4f1a76b8e5 (diff) | |
| parent | bc7b531330518db5f0d79216ac8a30636d73fbaf (diff) | |
| download | rabbitmq-server-git-0bd30c535063a2121e82eb7b26b2ecc1d042baa4.tar.gz | |
Merged bug23419 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugin_activator.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index 88300ab448..ef81ddf23a 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -33,8 +33,6 @@ -export([start/0, stop/0]). --define(DefaultPluginDir, "plugins"). --define(DefaultUnpackedPluginDir, "priv/plugins"). -define(BaseApps, [rabbit]). %%---------------------------------------------------------------------------- @@ -56,8 +54,8 @@ start() -> application:load(rabbit), %% Determine our various directories - PluginDir = get_env(plugins_dir, ?DefaultPluginDir), - UnpackedPluginDir = get_env(plugins_expand_dir, ?DefaultUnpackedPluginDir), + {ok, PluginDir} = application:get_env(rabbit, plugins_dir), + {ok, UnpackedPluginDir} = application:get_env(rabbit, plugins_expand_dir), RootName = UnpackedPluginDir ++ "/rabbit", @@ -142,12 +140,6 @@ start() -> stop() -> ok. -get_env(Key, Default) -> - case application:get_env(rabbit, Key) of - {ok, V} -> V; - _ -> Default - end. - determine_version(App) -> application:load(App), {ok, Vsn} = application:get_key(App, vsn), |