diff options
| author | Loïc Hoguin <[email protected]> | 2018-07-04 10:57:05 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-07-04 10:57:05 +0200 |
| commit | b400e34386ec0dc3f290da6c4671d7d0621d2fe6 (patch) | |
| tree | 2a59bcbe0ffbdb15ed7c22465b1473dbe1ba0502 /src/ranch_listener_sup.erl | |
| parent | f4a4843b1b242a3ee0de3f6dd76703f7c6492213 (diff) | |
| download | ranch-b400e34386ec0dc3f290da6c4671d7d0621d2fe6.tar.gz ranch-b400e34386ec0dc3f290da6c4671d7d0621d2fe6.tar.bz2 ranch-b400e34386ec0dc3f290da6c4671d7d0621d2fe6.zip | |
Better distinguish between Ranch and socket options
A map should now be used when specifying transport options
that contain more than just socket options. It is still
possible to pass a list of socket options directly as a
convenience.
The ack_timeout is renamed to handshake_timeout when
specified as a map. This corresponds to the new function
ranch:handshake/1,2 that will be favored in Ranch 2.0.
Specifying Ranch-specific options via the proplist will
no longer be possible starting from Ranch 2.0.
Diffstat (limited to 'src/ranch_listener_sup.erl')
| -rw-r--r-- | src/ranch_listener_sup.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ranch_listener_sup.erl b/src/ranch_listener_sup.erl index bd4ccc5..3853425 100644 --- a/src/ranch_listener_sup.erl +++ b/src/ranch_listener_sup.erl @@ -15,27 +15,27 @@ -module(ranch_listener_sup). -behaviour(supervisor). --export([start_link/6]). +-export([start_link/5]). -export([init/1]). --spec start_link(ranch:ref(), non_neg_integer(), module(), any(), module(), any()) +-spec start_link(ranch:ref(), module(), any(), module(), any()) -> {ok, pid()}. -start_link(Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts) -> - MaxConns = proplists:get_value(max_connections, TransOpts, 1024), +start_link(Ref, Transport, TransOpts, Protocol, ProtoOpts) -> + MaxConns = maps:get(max_connections, TransOpts, 1024), ranch_server:set_new_listener_opts(Ref, MaxConns, TransOpts, ProtoOpts, - [Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts]), + [Ref, Transport, TransOpts, Protocol, ProtoOpts]), supervisor:start_link(?MODULE, { - Ref, NumAcceptors, Transport, Protocol + Ref, Transport, Protocol }). -init({Ref, NumAcceptors, Transport, Protocol}) -> +init({Ref, Transport, Protocol}) -> ok = ranch_server:set_listener_sup(Ref, self()), ChildSpecs = [ {ranch_conns_sup, {ranch_conns_sup, start_link, [Ref, Transport, Protocol]}, permanent, infinity, supervisor, [ranch_conns_sup]}, {ranch_acceptors_sup, {ranch_acceptors_sup, start_link, - [Ref, NumAcceptors, Transport]}, + [Ref, Transport]}, permanent, infinity, supervisor, [ranch_acceptors_sup]} ], {ok, {{rest_for_one, 1, 5}, ChildSpecs}}. |