Rewrite the rabbitmqctl interface. Define trace_exchanges in rabbit.app.

1 files changed, 8 insertions, 16 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 5a013711..2a9dd463 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -282,18 +282,15 @@ action(list_consumers, Node, _Args, Opts, Inform) ->
         Other             -> Other
     end;
 
-action(set_env, Node, [Var, Term], _Opts, Inform) ->
-    Inform("Setting control variable ~s for node ~p to ~s", [Var, Node, Term]),
-    rpc_call(Node, rabbit, set_env, [parse(Var), parse(Term)]);
+action(start_tracing, Node, [XName], Opts, Inform) ->
+    VHost = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
+    Inform("Starting tracing", []),
+    rpc_call(Node, rabbit_trace, start, [VHost, XName]);
 
-action(get_env, Node, [Var], _Opts, Inform) ->
-    Inform("Getting control variable ~s for node ~p", [Var, Node]),
-    Val = rpc_call(Node, rabbit, get_env, [parse(Var)]),
-    io:format("~p~n", [Val]);
-
-action(unset_env, Node, [Var], _Opts, Inform) ->
-    Inform("Clearing control variable ~s for node ~p", [Var, Node]),
-    rpc_call(Node, rabbit, unset_env, [parse(Var)]);
+action(stop_tracing, Node, [], Opts, Inform) ->
+    VHost = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
+    Inform("Stopping tracing", []),
+    rpc_call(Node, rabbit_trace, stop, [VHost]);
 
 action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) ->
     VHost = proplists:get_value(?VHOST_OPT, Opts),
@@ -338,11 +335,6 @@ default_if_empty(List, Default) when is_list(List) ->
        true       -> [list_to_atom(X) || X <- List]
     end.
 
-parse(Str) ->
-    {ok, Tokens, _} = erl_scan:string(Str ++ "."),
-    {ok, Term} = erl_parse:parse_term(Tokens),
-    Term.
-
 display_info_list(Results, InfoItemKeys) when is_list(Results) ->
     lists:foreach(
       fun (Result) -> display_row(