diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2011-01-21 13:15:14 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-01-21 13:15:14 +0000 |
commit | 53b23eef04458c72e327b7218837b8321ea7057d (patch) | |
tree | 5bb0e4461ef9c487f4e1483863ac90657f2c6e31 | |
parent | 34290816e2bdfe4205bda82c6ae95aafef319d65 (diff) | |
parent | 15e93f4bd518848965fe22556200402270a1112d (diff) | |
download | rabbitmq-server-53b23eef04458c72e327b7218837b8321ea7057d.tar.gz |
merge bug23626 into default
-rw-r--r-- | src/rabbit_control.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 78391be2..4228ff7f 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -273,10 +273,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( - [lists:zip(InfoKeys, tuple_to_list(X)) || - X <- rpc_call(Node, rabbit_amqqueue, consumers_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(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) -> VHost = proplists:get_value(?VHOST_OPT, Opts), |