diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-09-17 10:13:48 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-09-17 10:13:48 +0100 |
| commit | 8faf835e65520045bb67538b86e4660db804dde3 (patch) | |
| tree | e30a76959c4d00a3707c7ae5d3c90da554660c8c | |
| parent | 06a30fdb757b93f976989d62d047e5b6a6553e42 (diff) | |
| download | rabbitmq-server-8faf835e65520045bb67538b86e4660db804dde3.tar.gz | |
Reinstate exported action/6, rabbit_test_util uses it!
| -rw-r--r-- | src/rabbit_plugins_main.erl | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl index 57a98f1f..aed95760 100644 --- a/src/rabbit_plugins_main.erl +++ b/src/rabbit_plugins_main.erl @@ -18,7 +18,7 @@ -include("rabbit.hrl"). -include("rabbit_cli.hrl"). --export([start/0, stop/0]). +-export([start/0, stop/0, action/6]). -define(GLOBAL_DEFS(Node), [?NODE_DEF(Node)]). @@ -51,15 +51,7 @@ start() -> parse_arguments(Args, NodeStr) end, fun (Command, Node, Args, Opts) -> - All = rabbit_plugins:list(PluginsDir), - Enabled = rabbit_plugins:read_enabled(PluginsFile), - Implicit = rabbit_plugins:dependencies(false, Enabled, All), - State = #cli{file = PluginsFile, - dir = PluginsDir, - all = All, - enabled = Enabled, - implicit = Implicit}, - action(Command, Node, Args, Opts, State) + action(Command, Node, Args, Opts, PluginsFile, PluginsDir) end, rabbit_plugins_usage). stop() -> @@ -71,6 +63,17 @@ parse_arguments(CmdLine, NodeStr) -> rabbit_cli:parse_arguments( ?COMMANDS, ?GLOBAL_DEFS(NodeStr), ?NODE_OPT, CmdLine). +action(Command, Node, Args, Opts, PluginsFile, PluginsDir) -> + All = rabbit_plugins:list(PluginsDir), + Enabled = rabbit_plugins:read_enabled(PluginsFile), + Implicit = rabbit_plugins:dependencies(false, Enabled, All), + State = #cli{file = PluginsFile, + dir = PluginsDir, + all = All, + enabled = Enabled, + implicit = Implicit}, + action(Command, Node, Args, Opts, State). + action(list, Node, [], Opts, State) -> action(list, Node, [".*"], Opts, State); action(list, Node, [Pat], Opts, State) -> |