summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-12-21 18:11:21 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2010-12-21 18:11:21 +0000
commit39849390f0f6800cbab1412803abf1a6d7f2a964 (patch)
tree80b1adb8ddc47fd9017d44f508f992c4cc486424
parentea23c42563351e8f80bff443d067d42dec84f812 (diff)
parent88e2c3481054633a653b360eaf1af6e48f09f48c (diff)
downloadrabbitmq-server-39849390f0f6800cbab1412803abf1a6d7f2a964.tar.gz
Merging bug 23634 into default. This makes ctl list_connections list all connections in a cluster, but I think that's more logical anyway and makes it match the behaviour of list_queues and list_exchanges etc etc
-rw-r--r--src/rabbit_networking.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 1c542ffe..86f066a4 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -246,8 +246,9 @@ start_ssl_client(SslOpts, Sock) ->
connections() ->
[rabbit_connection_sup:reader(ConnSup) ||
+ Node <- mnesia:system_info(running_db_nodes),
{_, ConnSup, supervisor, _}
- <- supervisor:which_children(rabbit_tcp_client_sup)].
+ <- supervisor:which_children({rabbit_tcp_client_sup, Node})].
connection_info_keys() -> rabbit_reader:info_keys().