diff options
| author | Loïc Hoguin <[email protected]> | 2013-08-31 10:05:43 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-08-31 10:05:43 +0200 |
| commit | f047b0990c4385eb6d5678b06fa2b404c66eb8b4 (patch) | |
| tree | 2f24bf75dad197142de9b03ec5de888195898b52 | |
| parent | 02a173259022fba7533ddb4239f962321066f875 (diff) | |
| parent | ef10414e67761f3e45500d1d0190dc6dfe60c4eb (diff) | |
| download | ranch-f047b0990c4385eb6d5678b06fa2b404c66eb8b4.tar.gz ranch-f047b0990c4385eb6d5678b06fa2b404c66eb8b4.tar.bz2 ranch-f047b0990c4385eb6d5678b06fa2b404c66eb8b4.zip | |
Merge branch 'no-shutdown-report' of git://github.com/fishcakez/ranch
| -rw-r--r-- | src/ranch_conns_sup.erl | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/ranch_conns_sup.erl b/src/ranch_conns_sup.erl index e16df69..245a5e0 100644 --- a/src/ranch_conns_sup.erl +++ b/src/ranch_conns_sup.erl @@ -149,12 +149,12 @@ loop(State=#state{parent=Parent, ref=Ref, conn_type=ConnType, {'EXIT', Parent, Reason} -> exit(Reason); {'EXIT', Pid, Reason} when Sleepers =:= [] -> - report_error(Ref, Pid, Reason), + report_error(Ref, Protocol, Pid, Reason), erase(Pid), loop(State, CurConns - 1, NbChildren - 1, Sleepers); %% Resume a sleeping acceptor if needed. {'EXIT', Pid, Reason} -> - report_error(Ref, Pid, Reason), + report_error(Ref, Protocol, Pid, Reason), erase(Pid), [To|Sleepers2] = Sleepers, To ! self(), @@ -198,10 +198,14 @@ system_code_change(Misc, _, _, _) -> %% We use ~999999p here instead of ~w because the latter doesn't %% support printable strings. -report_error(_, _, normal) -> +report_error(_, _, _, normal) -> ok; -report_error(Ref, Pid, Reason) -> +report_error(_, _, _, shutdown) -> + ok; +report_error(_, _, _, {shutdown, _}) -> + ok; +report_error(Ref, Protocol, Pid, Reason) -> error_logger:error_msg( - "Ranch listener ~p had connection process ~p " - "exit with reason: ~999999p~n", - [Ref, Pid, Reason]). + "Ranch listener ~p had connection process started with " + "~p:start_link/4 at ~p exit with reason: ~999999p~n", + [Ref, Protocol, Pid, Reason]). |