From 7cbc7fed32940a4aa7beedec9cac23376a19a8c0 Mon Sep 17 00:00:00 2001 From: "j.uhlig" Date: Thu, 3 May 2018 15:38:46 +0200 Subject: Remove socket option --- src/ranch_acceptors_sup.erl | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'src/ranch_acceptors_sup.erl') diff --git a/src/ranch_acceptors_sup.erl b/src/ranch_acceptors_sup.erl index 73dc9ea..cdb633b 100644 --- a/src/ranch_acceptors_sup.erl +++ b/src/ranch_acceptors_sup.erl @@ -28,23 +28,18 @@ init([Ref, Transport]) -> TransOpts = ranch_server:get_transport_options(Ref), NumAcceptors = maps:get(num_acceptors, TransOpts, 10), Logger = maps:get(logger, TransOpts, error_logger), - LSocket = case maps:get(socket, TransOpts, undefined) of - undefined -> - SocketOpts = maps:get(socket_opts, TransOpts, []), - %% We temporarily put the logger in the process dictionary - %% so that it can be used from ranch:filter_options. The - %% interface as it currently is does not allow passing it - %% down otherwise. - put(logger, Logger), - case Transport:listen(SocketOpts) of - {ok, Socket} -> - erase(logger), - Socket; - {error, Reason} -> - listen_error(Ref, Transport, SocketOpts, Reason, Logger) - end; - Socket -> - Socket + SocketOpts = maps:get(socket_opts, TransOpts, []), + %% We temporarily put the logger in the process dictionary + %% so that it can be used from ranch:filter_options. The + %% interface as it currently is does not allow passing it + %% down otherwise. + put(logger, Logger), + LSocket = case Transport:listen(SocketOpts) of + {ok, Socket} -> + erase(logger), + Socket; + {error, Reason} -> + listen_error(Ref, Transport, SocketOpts, Reason, Logger) end, {ok, Addr} = Transport:sockname(LSocket), ranch_server:set_addr(Ref, Addr), -- cgit v1.2.3