diff options
| author | Tim Watson <tim@rabbitmq.com> | 2014-03-17 16:03:26 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2014-03-17 16:03:26 +0000 |
| commit | 4f49d35cc51548a1c1015fd2b63b1557682772b8 (patch) | |
| tree | 851a7c2dffc706dcf07f556b932787a823b300b3 | |
| parent | ddca9baeeae77bc4d575b9bd77421ce6a270a30e (diff) | |
| download | rabbitmq-server-git-4f49d35cc51548a1c1015fd2b63b1557682772b8.tar.gz | |
Calculate enabled vs. active correctly for 'list' operations
| -rw-r--r-- | src/rabbit_plugins_main.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl index e7f9c02217..c9d4b73fab 100644 --- a/src/rabbit_plugins_main.erl +++ b/src/rabbit_plugins_main.erl @@ -220,16 +220,16 @@ format_plugins(Node, Pattern, Opts, PluginsFile, PluginsDir) -> OnlyActive = proplists:get_bool(?ACTIVE_ONLY_OPT, Opts), OnlyInactive = proplists:get_bool(?INACTIVE_ONLY_OPT, Opts), + AvailablePlugins = rabbit_plugins:list(PluginsDir), + EnabledExplicitly = rabbit_plugins:read_enabled(PluginsFile), + AllEnabled = rabbit_plugins:dependencies(false, EnabledExplicitly, + AvailablePlugins), + EnabledImplicitly = AllEnabled -- EnabledExplicitly, ActivePlugins = case rpc:call(Node, rabbit_plugins, active, [], ?RPC_TIMEOUT) of - {badrpc, _} -> []; + {badrpc, _} -> AllEnabled; Active -> Active end, - AvailablePlugins = rabbit_plugins:list(PluginsDir), - EnabledExplicitly = rabbit_plugins:read_enabled(PluginsFile), - EnabledImplicitly = - rabbit_plugins:dependencies(false, EnabledExplicitly, - AvailablePlugins) -- EnabledExplicitly, Missing = [#plugin{name = Name, dependencies = []} || Name <- ((EnabledExplicitly ++ EnabledImplicitly) -- plugin_names(AvailablePlugins))], |