summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2018-09-19 10:37:00 +0200
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2018-09-19 10:37:00 +0200
commit9920cea9693d467c31838fed82fbb81adda7bf77 (patch)
tree025e88362b3f4647a3354bd60ff36a45188af36d /src
parent8f71523f001aa484fa514724dee15ed9ace87adc (diff)
downloadrabbitmq-server-git-9920cea9693d467c31838fed82fbb81adda7bf77.tar.gz
tcp_listener_sup: Switch to ranch:child_spec/5
ranch:child_spec/6 is deprecated.
Diffstat (limited to 'src')
-rw-r--r--src/tcp_listener_sup.erl16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl
index 7cb1214c8e..4ac80b13b6 100644
--- a/src/tcp_listener_sup.erl
+++ b/src/tcp_listener_sup.erl
@@ -50,12 +50,18 @@ init({IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, On
ConcurrentAcceptorCount, Label}) ->
{ok, AckTimeout} = application:get_env(rabbit, ssl_handshake_timeout),
MaxConnections = rabbit_misc:get_env(rabbit, connection_max, infinity),
+ RanchListenerOpts = #{
+ num_acceptors => ConcurrentAcceptorCount,
+ max_connections => MaxConnections,
+ handshake_timeout => AckTimeout,
+ connection_type => supervisor,
+ socket_opts => [{ip, IPAddress},
+ {port, Port} |
+ SocketOpts]
+ },
{ok, {{one_for_all, 10, 10}, [
- ranch:child_spec({acceptor, IPAddress, Port}, ConcurrentAcceptorCount,
- Transport, [{port, Port}, {ip, IPAddress},
- {max_connections, MaxConnections},
- {ack_timeout, AckTimeout},
- {connection_type, supervisor}|SocketOpts],
+ ranch:child_spec({acceptor, IPAddress, Port},
+ Transport, RanchListenerOpts,
ProtoSup, ProtoOpts),
{tcp_listener, {tcp_listener, start_link,
[IPAddress, Port,