← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/inets/src/http_server/httpd_acceptor.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/inets/src/http_server/httpd_acceptor.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%%
4
 
%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
5
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
139
139
            handle_error(Reason, ConfigDb),
140
140
            ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
141
141
                                  ConfigDb, AcceptTimeout);
142
 
        {'EXIT', _Reason} = EXIT ->
143
 
            ?hdri("accept exited", [{reason, _Reason}]),
144
 
            handle_error(EXIT, ConfigDb),
145
 
            ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
146
 
                                  ConfigDb, AcceptTimeout)
 
142
        {'EXIT', Reason} ->
 
143
            ?hdri("accept exited", [{reason, Reason}]),
 
144
            ReasonString = 
 
145
                lists:flatten(io_lib:format("Accept exit: ~p", [Reason])),
 
146
            accept_failed(ConfigDb, ReasonString)
147
147
    end.
148
148
 
149
149
 
189
189
    %% not write an error message.
190
190
    ok;
191
191
 
192
 
handle_error({'EXIT', Reason}, ConfigDb) ->
193
 
    String = lists:flatten(io_lib:format("Accept exit: ~p", [Reason])),
194
 
    accept_failed(ConfigDb, String);
195
 
 
196
192
handle_error(Reason, ConfigDb) ->
197
193
    String = lists:flatten(io_lib:format("Accept error: ~p", [Reason])),
198
194
    accept_failed(ConfigDb, String).
199
195
 
200
 
-spec accept_failed(_, string()) -> no_return(). 
 
196
 
 
197
-spec accept_failed(ConfigDB     :: term(), 
 
198
                    ReasonString :: string()) -> no_return(). 
201
199
 
202
200
accept_failed(ConfigDb, String) ->
203
201
    error_logger:error_report(String),