summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-11-30 13:01:10 +0000
committerEmile Joubert <emile@rabbitmq.com>2011-11-30 13:01:10 +0000
commit79a2e2da9bfc918f48b7e6ed92f1f573c4afae8a (patch)
tree6c10f58fe68570bbc63f1eddc5b9cfdbc1c8eb12
parent11f6e036dff49c982e841462c6b8ba2bc5017656 (diff)
parent4a0cc6d00174a3d128f032fc78644e3cc649ebae (diff)
downloadrabbitmq-server-79a2e2da9bfc918f48b7e6ed92f1f573c4afae8a.tar.gz
Merged bug24591 into default
-rw-r--r--src/rabbit_networking.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 2c0912df..045ab89a 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -307,9 +307,15 @@ connections() ->
rabbit_networking, connections_local, []).
connections_local() ->
- [rabbit_connection_sup:reader(ConnSup) ||
+ [Reader ||
{_, ConnSup, supervisor, _}
- <- supervisor:which_children(rabbit_tcp_client_sup)].
+ <- supervisor:which_children(rabbit_tcp_client_sup),
+ Reader <- [try
+ rabbit_connection_sup:reader(ConnSup)
+ catch exit:{noproc, _} ->
+ noproc
+ end],
+ Reader =/= noproc].
connection_info_keys() -> rabbit_reader:info_keys().