summaryrefslogtreecommitdiff
path: root/src
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
commit5930d0453865b6a73919131e8b4a32c7f1938112 (patch)
tree6c10f58fe68570bbc63f1eddc5b9cfdbc1c8eb12 /src
parent8d9e6661f74372f26c244f0cf7b389dc64e9983d (diff)
parentfa9a7e7e7814fa297b59c62b08049145a7530d37 (diff)
downloadrabbitmq-server-git-5930d0453865b6a73919131e8b4a32c7f1938112.tar.gz
Merged bug24591 into default
Diffstat (limited to 'src')
-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 2c0912dfd6..045ab89a70 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().