diff options
| author | Micael Karlberg <[email protected]> | 2011-12-01 12:27:45 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-12-01 12:27:45 +0100 |
| commit | 38bb19c5c4bdeeb4d54a62d687d9371eb7976c3f (patch) | |
| tree | 230fc0054d2394885a2512017649b769b8ea26ad /lib/inets/src/http_server/httpd_acceptor.erl | |
| parent | 3cf5f67f3545cc82147706cc83febc242f6e469a (diff) | |
| parent | 5df28c6c7d3c5948ff02ae197f1f11eff96cc68d (diff) | |
| download | otp-38bb19c5c4bdeeb4d54a62d687d9371eb7976c3f.tar.gz otp-38bb19c5c4bdeeb4d54a62d687d9371eb7976c3f.tar.bz2 otp-38bb19c5c4bdeeb4d54a62d687d9371eb7976c3f.zip | |
Merge branch 'bmk/inets/inets58_integration2'
Diffstat (limited to 'lib/inets/src/http_server/httpd_acceptor.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_acceptor.erl | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/inets/src/http_server/httpd_acceptor.erl b/lib/inets/src/http_server/httpd_acceptor.erl index bcebb6a9e3..046e491bbf 100644 --- a/lib/inets/src/http_server/httpd_acceptor.erl +++ b/lib/inets/src/http_server/httpd_acceptor.erl @@ -139,11 +139,11 @@ acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout) -> handle_error(Reason, ConfigDb), ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout); - {'EXIT', _Reason} = EXIT -> - ?hdri("accept exited", [{reason, _Reason}]), - handle_error(EXIT, ConfigDb), - ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, - ConfigDb, AcceptTimeout) + {'EXIT', Reason} -> + ?hdri("accept exited", [{reason, Reason}]), + ReasonString = + lists:flatten(io_lib:format("Accept exit: ~p", [Reason])), + accept_failed(ConfigDb, ReasonString) end. @@ -189,15 +189,13 @@ handle_error(esslaccept, _) -> %% not write an error message. ok; -handle_error({'EXIT', Reason}, ConfigDb) -> - String = lists:flatten(io_lib:format("Accept exit: ~p", [Reason])), - accept_failed(ConfigDb, String); - handle_error(Reason, ConfigDb) -> String = lists:flatten(io_lib:format("Accept error: ~p", [Reason])), accept_failed(ConfigDb, String). --spec accept_failed(_, string()) -> no_return(). + +-spec accept_failed(ConfigDB :: term(), + ReasonString :: string()) -> no_return(). accept_failed(ConfigDb, String) -> error_logger:error_report(String), |