diff options
| author | juhlig <[email protected]> | 2020-02-19 11:49:17 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2020-02-21 11:19:36 +0100 |
| commit | 4b80e31bc48a7fd8552ee34f59de26c790b19ceb (patch) | |
| tree | 7ab27cf2d116ea2a53424ba45cef7c7d08c3f5c0 | |
| parent | 4ffe0c99114ab7049aa19a3a2c33d662e7cf311d (diff) | |
| download | ranch-4b80e31bc48a7fd8552ee34f59de26c790b19ceb.tar.gz ranch-4b80e31bc48a7fd8552ee34f59de26c790b19ceb.tar.bz2 ranch-4b80e31bc48a7fd8552ee34f59de26c790b19ceb.zip | |
Prevent side effects in init of supervisors
| -rw-r--r-- | src/ranch_acceptors_sup.erl | 9 | ||||
| -rw-r--r-- | src/ranch_app.erl | 2 | ||||
| -rw-r--r-- | src/ranch_sup.erl | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/ranch_acceptors_sup.erl b/src/ranch_acceptors_sup.erl index 0976a12..f6f26c7 100644 --- a/src/ranch_acceptors_sup.erl +++ b/src/ranch_acceptors_sup.erl @@ -28,7 +28,14 @@ init([Ref, Transport, Logger]) -> TransOpts = ranch_server:get_transport_options(Ref), NumAcceptors = maps:get(num_acceptors, TransOpts, 10), NumListenSockets = maps:get(num_listen_sockets, TransOpts, 1), - LSockets = start_listen_sockets(Ref, NumListenSockets, Transport, TransOpts, Logger), + LSockets = case get(lsockets) of + undefined -> + LSockets1 = start_listen_sockets(Ref, NumListenSockets, Transport, TransOpts, Logger), + put(lsockets, LSockets1), + LSockets1; + LSockets1 -> + LSockets1 + end, Procs = [begin LSocketId = (AcceptorId rem NumListenSockets) + 1, {_, LSocket} = lists:keyfind(LSocketId, 1, LSockets), diff --git a/src/ranch_app.erl b/src/ranch_app.erl index e65db48..8069239 100644 --- a/src/ranch_app.erl +++ b/src/ranch_app.erl @@ -22,6 +22,8 @@ -spec start(application:start_type(), term()) -> {ok, pid()} | {error, term()}. start(_, _) -> _ = consider_profiling(), + ranch_server = ets:new(ranch_server, [ + ordered_set, public, named_table]), ranch_sup:start_link(). -spec stop(term()) -> ok. diff --git a/src/ranch_sup.erl b/src/ranch_sup.erl index 64137a2..481088a 100644 --- a/src/ranch_sup.erl +++ b/src/ranch_sup.erl @@ -32,8 +32,6 @@ init([]) -> {ok, Value2} -> Value2; undefined -> 5 end, - ranch_server = ets:new(ranch_server, [ - ordered_set, public, named_table]), Procs = [ #{id => ranch_server, start => {ranch_server, start_link, []}} ], |