diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-21 16:39:34 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-21 16:39:34 +0000 |
| commit | 5d048144d014ef181bccfecbcad20b90fef92f7b (patch) | |
| tree | 3537acdf87c8e3c64d1619d7e12e1daf525567a3 | |
| parent | 6d12e57aaa61b10df739e289086c499b130da52d (diff) | |
| parent | 1678bb99d157e94cf8c904a8ab39e1a5f3898be0 (diff) | |
| download | rabbitmq-server-git-5d048144d014ef181bccfecbcad20b90fef92f7b.tar.gz | |
Merging bug23727 into bug23554
| -rw-r--r-- | include/gm_specs.hrl | 2 | ||||
| -rw-r--r-- | src/gm.erl | 2 | ||||
| -rw-r--r-- | src/gm_test.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 11 |
4 files changed, 10 insertions, 7 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index 7f607755c5..987866db38 100644 --- a/include/gm_specs.hrl +++ b/include/gm_specs.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2010 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved. %% -ifdef(use_specs). diff --git a/src/gm.erl b/src/gm.erl index baf46471c6..8fea919667 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2010 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved. %% -module(gm). diff --git a/src/gm_test.erl b/src/gm_test.erl index e8f2859832..e0a92a0c45 100644 --- a/src/gm_test.erl +++ b/src/gm_test.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2010 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved. %% -module(gm_test). diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 4dfc34b57c..ea29aa052e 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), |