diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-08 05:08:32 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-08 05:08:32 +0100 |
| commit | 62dcf279ab6c4d2453d4bf0e9afec6e787025180 (patch) | |
| tree | 1a17ef7342112031c624642880240085fd7d99d4 | |
| parent | 1d93d5753d441709b7dc214ccc01db3f87651d31 (diff) | |
| download | rabbitmq-server-git-62dcf279ab6c4d2453d4bf0e9afec6e787025180.tar.gz | |
cosmetic
| -rw-r--r-- | src/rabbit_plugins.erl | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index a7178563ba..72d1696cd8 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -47,13 +47,12 @@ %% @doc Prepares the file system and installs all enabled plugins. setup() -> - {ok, PluginDir} = application:get_env(rabbit, plugins_dir), - {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir), - {ok, EnabledPluginsFile} = application:get_env(rabbit, - enabled_plugins_file), - prepare_plugins(EnabledPluginsFile, PluginDir, ExpandDir), + {ok, PluginDir} = application:get_env(rabbit, plugins_dir), + {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir), + {ok, EnabledFile} = application:get_env(rabbit, enabled_plugins_file), + prepare_plugins(EnabledFile, PluginDir, ExpandDir), [prepare_dir_plugin(PluginName) || - PluginName <- filelib:wildcard(ExpandDir ++ "/*/ebin/*.app")]. + PluginName <- filelib:wildcard("*/ebin/*.app", ExpandDir)]. %% @doc Lists the plugins which are currently running. active() -> @@ -112,17 +111,16 @@ dependencies(Reverse, Sources, AllPlugins) -> %%---------------------------------------------------------------------------- -prepare_plugins(EnabledPluginsFile, PluginsDistDir, DestDir) -> +prepare_plugins(EnabledFile, PluginsDistDir, DestDir) -> AllPlugins = list(PluginsDistDir), - Enabled = read_enabled(EnabledPluginsFile), + Enabled = read_enabled(EnabledFile), ToUnpack = dependencies(false, Enabled, AllPlugins), ToUnpackPlugins = lookup_plugins(ToUnpack, AllPlugins), - Missing = Enabled -- plugin_names(ToUnpackPlugins), - case Missing of - [] -> ok; - _ -> io:format("Warning: the following enabled plugins were " - "not found: ~p~n", [Missing]) + case Enabled -- plugin_names(ToUnpackPlugins) of + [] -> ok; + Missing -> io:format("Warning: the following enabled plugins were " + "not found: ~p~n", [Missing]) end, %% Eliminate the contents of the destination directory |