diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-02 16:33:41 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-02 16:33:41 +0100 |
| commit | 7eaae5011bf69aa05e1fb33247630b1355e8f74f (patch) | |
| tree | 5e5d84de6cbb5564d605713004d74bc855a9a8fd | |
| parent | 20efde3748633f362dbef33f0190021f5b0df464 (diff) | |
| download | rabbitmq-server-git-7eaae5011bf69aa05e1fb33247630b1355e8f74f.tar.gz | |
Tidy up slightly and make rabbitmqctl list_channels cluster aware.
| -rw-r--r-- | src/rabbit_channel.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 7c8a07b9d7..9dbef43a71 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -133,6 +133,11 @@ confirm(Pid, MsgSeqNos) -> list() -> pg_local:get_members(rabbit_channels). +list_all_nodes() -> + [Pid || + Node <- rabbit_mnesia:running_clustered_nodes(), + Pid <- rpc:call(Node, rabbit_channel, list, [])]. + info_keys() -> ?INFO_KEYS. info(Pid) -> @@ -145,10 +150,11 @@ info(Pid, Items) -> end. info_all() -> - rabbit_misc:filter_exit_map(fun (C) -> info(C) end, list()). + rabbit_misc:filter_exit_map(fun (C) -> info(C) end, list_all_nodes()). info_all(Items) -> - rabbit_misc:filter_exit_map(fun (C) -> info(C, Items) end, list()). + rabbit_misc:filter_exit_map(fun (C) -> info(C, Items) end, + list_all_nodes()). refresh_config_all() -> rabbit_misc:upmap( @@ -162,11 +168,8 @@ ready_for_close(Pid) -> gen_server2:cast(Pid, ready_for_close). force_event_refresh() -> - %% TODO roll in bug 23897? - All = [Pid || - Node <- rabbit_mnesia:running_clustered_nodes(), - Pid <- rpc:call(Node, rabbit_channel, list, [])], - rabbit_misc:filter_exit_map(fun (C) -> force_event_refresh(C) end, All). + rabbit_misc:filter_exit_map(fun (C) -> force_event_refresh(C) end, + list_all_nodes()). force_event_refresh(Pid) -> gen_server2:cast(Pid, force_event_refresh). |