diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-05-27 09:30:50 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-05-27 09:30:50 +0100 |
| commit | 8e67acc47eb955b5222334280bd153936cec94ba (patch) | |
| tree | 4b61b715339cab271f15cac0edb72081ad539ca9 /src/rabbit_control.erl | |
| parent | 7e12686d597f02df55f21790b0667ba6e8dc109a (diff) | |
| download | rabbitmq-server-8e67acc47eb955b5222334280bd153936cec94ba.tar.gz | |
Rollback info_all renaming
Diffstat (limited to 'src/rabbit_control.erl')
| -rw-r--r-- | src/rabbit_control.erl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 8ced9dd6..ef5fd420 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -260,7 +260,7 @@ action(list_bindings, Node, Args, Opts, Inform) -> action(list_connections, Node, Args, _Opts, Inform) -> Inform("Listing connections", []), ArgAtoms = default_if_empty(Args, [user, peer_address, peer_port, state]), - display_info_list(rpc_call(Node, rabbit_networking, info_all, + display_info_list(rpc_call(Node, rabbit_networking, connection_info_all, [ArgAtoms]), ArgAtoms); @@ -275,8 +275,13 @@ action(list_consumers, Node, _Args, Opts, Inform) -> Inform("Listing consumers", []), VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)), InfoKeys = [queue_name, channel_pid, consumer_tag, ack_required], - display_info_list(rpc_call(Node, rabbit_consumer, info_all, [VHostArg]), - InfoKeys); + case rpc_call(Node, rabbit_amqqueue, consumers_all, [VHostArg]) of + L when is_list(L) -> display_info_list( + [lists:zip(InfoKeys, tuple_to_list(X)) || + X <- L], + InfoKeys); + Other -> Other + end; action(trace_on, Node, [], Opts, Inform) -> VHost = proplists:get_value(?VHOST_OPT, Opts), @@ -318,9 +323,8 @@ action(report, Node, _Args, _Opts, Inform) -> _ -> ok end end, - GlobalQueries = [rabbit_networking, rabbit_channel], - VHostQueries = [rabbit_amqqueue, rabbit_exchange, rabbit_binding, - rabbit_consumer], + GlobalQueries = [rabbit_channel], + VHostQueries = [rabbit_amqqueue, rabbit_exchange, rabbit_binding], [Report(M, []) || M <- GlobalQueries], [Report(M, [V]) || V <- rpc_call(Node, rabbit_vhost, list, []), M <- VHostQueries], |