diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-09-01 12:29:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 12:29:51 -0700 |
| commit | 32b0c21039bec7bb839afdd6e0e9fd4297a12822 (patch) | |
| tree | 56425f5ecf1ad9ca9e8bd06605a83eabc30837e6 /src | |
| parent | 68e458f1891beeed54adb7a90460a6851f59112d (diff) | |
| parent | 41133ae101402e952a05d6a7cdccca942e9502d0 (diff) | |
| download | rabbitmq-server-git-32b0c21039bec7bb839afdd6e0e9fd4297a12822.tar.gz | |
Merge pull request #2439 from rabbitmq/rabbitmq-mqtt-revert-233-changes
Revert "tcp_listener_sup: use maps for supervisor flags and child spec"
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_networking.erl | 11 | ||||
| -rw-r--r-- | src/tcp_listener_sup.erl | 12 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index bfb1424b13..a9a89434b1 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -184,14 +184,9 @@ tcp_listener_spec(NamePrefix, {IPAddress, Port, Family}, SocketOpts, {?MODULE, tcp_listener_started, [Protocol, SocketOpts]}, {?MODULE, tcp_listener_stopped, [Protocol, SocketOpts]}, NumAcceptors, Label], - #{ - id => rabbit_misc:tcp_name(NamePrefix, IPAddress, Port), - start => {tcp_listener_sup, start_link, Args}, - restart => transient, - shutdown => infinity, - type => supervisor, - modules => [tcp_listener_sup] - }. + {rabbit_misc:tcp_name(NamePrefix, IPAddress, Port), + {tcp_listener_sup, start_link, Args}, + transient, infinity, supervisor, [tcp_listener_sup]}. -spec ranch_ref(#listener{} | [{atom(), any()}] | 'undefined') -> ranch:ref() | undefined. ranch_ref(#listener{port = Port}) -> diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl index 76ff814ff4..82128bb2af 100644 --- a/src/tcp_listener_sup.erl +++ b/src/tcp_listener_sup.erl @@ -45,15 +45,9 @@ init({IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, On {port, Port} | SocketOpts] }, - Flags = #{strategy => one_for_all, intensity => 10, period => 10}, - OurChildSpec = #{ - id => tcp_listener, - start => {tcp_listener, start_link, [IPAddress, Port, OnStartup, OnShutdown, Label]}, - restart => transient, - shutdown => 16#ffffffff, - type => worker, - modules => [tcp_listener] - }, + Flags = {one_for_all, 10, 10}, + OurChildSpecStart = {tcp_listener, start_link, [IPAddress, Port, OnStartup, OnShutdown, Label]}, + OurChildSpec = {tcp_listener, OurChildSpecStart, transient, 16#ffffffff, worker, [tcp_listener]}, RanchChildSpec = ranch:child_spec(rabbit_networking:ranch_ref(IPAddress, Port), Transport, RanchListenerOpts, ProtoSup, ProtoOpts), |