diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-08 18:12:40 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-08 18:12:40 +0100 |
| commit | bacde2bf8a0b85166a0117c42a0d50df4f3f3c74 (patch) | |
| tree | 349ebeb6c04c4eb3fe52dd593ac5d2d6db73a0ae | |
| parent | bc6df57d4b683ebbb73f3866c086a1fd285770bd (diff) | |
| download | rabbitmq-server-git-bacde2bf8a0b85166a0117c42a0d50df4f3f3c74.tar.gz | |
Use monitor, not link
| -rw-r--r-- | src/rabbit_channel_sup_sup.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel_sup_sup.erl b/src/rabbit_channel_sup_sup.erl index d193880555..f7249221b2 100644 --- a/src/rabbit_channel_sup_sup.erl +++ b/src/rabbit_channel_sup_sup.erl @@ -54,7 +54,7 @@ start_link() -> start_channel(Pid, Args) -> {ok, ChSupPid, _} = Result = supervisor2:start_child(Pid, [Args]), - link(ChSupPid), + erlang:monitor(process, ChSupPid), Result. %%---------------------------------------------------------------------------- diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index a21961b5e0..adf0d1b6ad 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -339,7 +339,7 @@ mainloop(Deb, State = #v1{parent = Parent, sock= Sock, recv_ref = Ref}) -> throw(E); {channel_exit, ChannelOrFrPid, Reason} -> mainloop(Deb, handle_channel_exit(ChannelOrFrPid, Reason, State)); - {'EXIT', ChSupPid, Reason} -> + {'DOWN', _MRef, process, ChSupPid, Reason} -> mainloop(Deb, handle_dependent_exit(ChSupPid, Reason, State)); terminate_connection -> State; |