diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-07-06 18:31:56 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-07-06 18:31:56 +0100 |
| commit | 753bdcd0ce88868fb723e792d91c9fdd59ea3c9b (patch) | |
| tree | a3debc50e689579f9e81afbc512957ad2faae32e /src/rabbit_networking.erl | |
| parent | fe2b74cdfce74e7ccc33e287080a7cb500978e1f (diff) | |
| download | rabbitmq-server-753bdcd0ce88868fb723e792d91c9fdd59ea3c9b.tar.gz | |
And now the channel, writer, limiter and framing_channel are also all suitably supervisored
Diffstat (limited to 'src/rabbit_networking.erl')
| -rw-r--r-- | src/rabbit_networking.erl | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 6502c6d1..e7094640 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -201,12 +201,10 @@ on_node_down(Node) -> start_client(Sock, SockTransform) -> {ok, Child} = supervisor:start_child(rabbit_tcp_client_sup, []), - hd([begin - ok = rabbit_net:controlling_process(Sock, Reader), - Reader ! {go, Sock, SockTransform}, - Reader - end || {reader, Reader, worker, [rabbit_reader]} - <- supervisor:which_children(Child)]). + Reader = rabbit_connection_sup:reader(Child), + ok = rabbit_net:controlling_process(Sock, Reader), + Reader ! {go, Sock, SockTransform}, + Reader. start_client(Sock) -> start_client(Sock, fun (S) -> {ok, S} end). @@ -229,10 +227,9 @@ start_ssl_client(SslOpts, Sock) -> end). connections() -> - [Pid || {_, ConnSup, supervisor, _} - <- supervisor:which_children(rabbit_tcp_client_sup), - {reader, Pid, worker, [rabbit_reader]} - <- supervisor:which_children(ConnSup)]. + [rabbit_connection_sup:reader(ConnSup) || + {_, ConnSup, supervisor, _} + <- supervisor:which_children(rabbit_tcp_client_sup)]. connection_info_keys() -> rabbit_reader:info_keys(). |