diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-21 15:31:37 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-21 15:31:37 +0000 |
| commit | baa1ac7e53bead635f9e24191c62ff492b772bfd (patch) | |
| tree | 118ce94d74d97b5b3e59740cdb995e58f3e67de7 /src | |
| parent | baefffb00838306772a6d470f96db0c432ce83bd (diff) | |
| parent | 04af35656ad30e621b238d0e1000f26b5f450f00 (diff) | |
| download | rabbitmq-server-git-baa1ac7e53bead635f9e24191c62ff492b772bfd.tar.gz | |
Merging default into bug23696
Diffstat (limited to 'src')
| -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 78391be2ef..4228ff7fd3 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), |