Set transport options without suspend

Lift the restriction that a listener must be suspended before
transport options can be changed.

* Changes to the `max_connections`, `handshake_timeout` and `shutdown`
  options will take effect immediately.
* Changes to the `num_acceptors`, `num_listen_sockets` and `socket_opts`
  options will take effect when a listener is suspended and resumed, or
  when the acceptors supervisor restarts.
* Changes to the `num_conns_sups` and `connection_type` options will only
  take effect when the connections super-supervisor restarts.
* Changes to the `logger` option will never take effect, unless a listener
  is stopped and started with fresh transport options.

The fetching and handing down of transport options changes with this
commit, to ensure consistency between the individual components in the
hierarchy.

* The `num_acceptors` option is handed down from the listener supervisor to
  the acceptors supervisor in the child spec, while the `num_listen_sockets`
  and `socket_opts` options are read inside the acceptors supervisor itself.
  This way, the `num_acceptors` option will only take effect when the listener
  supervisor restarts, whereas the other two options will take effect
  when acceptors supervisor restarts. This commit moves the fetching of
  the `num_acceptors` option into the acceptors supervisor as well.
* The `logger` option is read in multiple places throughout the hierarchy.
  This way it may happen that processes that suffered a crash and restart
  may use a different logger than other processes that did not. This commit
  reads the `logger` from the transport options given to the listener supervisor
  start function, and hands it down from there.
* The `connection_type` option is read individually by each connection supervisor.
  This way, a restart of an individual connection supervisor may cause them
  to use a different connection type than the others. This commit reads the
  transport options in the connections super-supervisor, and hands them down to
  the individual connections supervisors.
* The `num_conns_sups` is handed down from the listener supervisor to the
  connections super-supervisor. This way, a change to this option will only
  take effect when the listener supervisor restarts. This commit moves
  the fetching of this option inside the connections super-supervisor. This
  change is merely for structural consistency, it is not necessary for operational
  consistency.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/ranch_conns_sup_sup.erl b/src/ranch_conns_sup_sup.erl
index 4b1dd47..61ace8e 100644
--- a/src/ranch_conns_sup_sup.erl
+++ b/src/ranch_conns_sup_sup.erl
@@ -19,19 +19,22 @@
 -export([start_link/4]).
 -export([init/1]).
 
--spec start_link(ranch:ref(), pos_integer(), ranch:opts(), module()) -> {ok, pid()}.
-start_link(Ref, NumConnsSups, Transport, Protocol) ->
+-spec start_link(ranch:ref(), module(), module(), module()) -> {ok, pid()}.
+start_link(Ref, Transport, Protocol, Logger) ->
 	ok = ranch_server:cleanup_connections_sups(Ref),
 	supervisor:start_link(?MODULE, {
-		Ref, NumConnsSups, Transport, Protocol
+		Ref, Transport, Protocol, Logger
 	}).
 
--spec init({ranch:ref(), pos_integer(), module(), module()})
+-spec init({ranch:ref(), module(), module(), module()})
 	-> {ok, {supervisor:sup_flags(), [supervisor:child_spec()]}}.
-init({Ref, NumConnsSups, Transport, Protocol}) ->
+init({Ref, Transport, Protocol, Logger}) ->
+	TransOpts = ranch_server:get_transport_options(Ref),
+	NumAcceptors = maps:get(num_acceptors, TransOpts, 10),
+	NumConnsSups = maps:get(num_conns_sups, TransOpts, NumAcceptors),
 	ChildSpecs = [#{
 		id => {ranch_conns_sup, N},
-		start => {ranch_conns_sup, start_link, [Ref, N, Transport, Protocol]},
+		start => {ranch_conns_sup, start_link, [Ref, N, Transport, TransOpts, Protocol, Logger]},
 		type => supervisor
 	} || N <- lists:seq(1, NumConnsSups)],
 	{ok, {#{intensity => 1 + ceil(math:log2(NumConnsSups))}, ChildSpecs}}.