diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2018-10-03 16:31:50 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-10-03 16:31:50 +0300 |
| commit | fcee3472db31170be67c9a177a5557ecc00dc4be (patch) | |
| tree | a33a88fab4f1a71155cf169b48bae9cf6ccad757 /src | |
| parent | b43396953fb7a5c2cc42bfa2cfe028ca1d3caf5e (diff) | |
| download | rabbitmq-server-git-fcee3472db31170be67c9a177a5557ecc00dc4be.tar.gz | |
plugins_dist_dir/0 => plugins_dir/0
To match the name commonly used elsewhere.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugins.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 4e04f94f6a..51c59651f1 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -23,7 +23,7 @@ -export([extract_schemas/1]). -export([validate_plugins/1, format_invalid_plugins/1]). -export([is_strictly_plugin/1, strictly_plugins/2, strictly_plugins/1]). --export([plugins_dist_dir/0, plugins_expand_dir/0, enabled_plugins_file/0]). +-export([plugins_dir/0, plugins_expand_dir/0, enabled_plugins_file/0]). % Export for testing purpose. -export([is_version_supported/2, validate_plugins/2]). @@ -98,8 +98,8 @@ plugins_expand_dir() -> filename:join([rabbit_mnesia:dir(), "plugins_expand_dir"]) end. --spec plugins_dist_dir() -> file:filename(). -plugins_dist_dir() -> +-spec plugins_dir() -> file:filename(). +plugins_dir() -> case application:get_env(rabbit, plugins_dir) of {ok, PluginsDistDir} -> PluginsDistDir; @@ -184,7 +184,7 @@ extract_schema(#plugin{type = dir, location = Location}, SchemaDir) -> %% @doc Lists the plugins which are currently running. active() -> - InstalledPlugins = plugin_names(list(plugins_dist_dir())), + InstalledPlugins = plugin_names(list(plugins_dir())), [App || {App, _, _} <- rabbit_misc:which_applications(), lists:member(App, InstalledPlugins)]. @@ -240,7 +240,7 @@ strictly_plugins(Plugins, AllPlugins) -> end, Plugins). strictly_plugins(Plugins) -> - AllPlugins = list(plugins_dist_dir()), + AllPlugins = list(plugins_dir()), lists:filter( fun(Name) -> is_strictly_plugin(lists:keyfind(Name, #plugin.name, AllPlugins)) @@ -296,7 +296,7 @@ running_plugins() -> prepare_plugins(Enabled) -> ExpandDir = plugins_expand_dir(), - AllPlugins = list(plugins_dist_dir()), + AllPlugins = list(plugins_dir()), Wanted = dependencies(false, Enabled, AllPlugins), WantedPlugins = lookup_plugins(Wanted, AllPlugins), {ValidPlugins, Problems} = validate_plugins(WantedPlugins), |