diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-10-20 21:26:30 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-10-20 21:26:30 +0300 |
| commit | 08700282b7176d62cb262a66eceb576610d66c4d (patch) | |
| tree | da13a90ecd96b18c32144ab26f0df160dcae5337 /src | |
| parent | 18cb88ee282b359987b42a36db2670ad76787464 (diff) | |
| parent | 88485d9d9e5586394fe3bb162181c0e723152a53 (diff) | |
| download | rabbitmq-server-git-08700282b7176d62cb262a66eceb576610d66c4d.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/tcp_listener_sup.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl index 14654535d6..7cb1214c8e 100644 --- a/src/tcp_listener_sup.erl +++ b/src/tcp_listener_sup.erl @@ -49,10 +49,11 @@ start_link(IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartu init({IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, OnShutdown, ConcurrentAcceptorCount, Label}) -> {ok, AckTimeout} = application:get_env(rabbit, ssl_handshake_timeout), + MaxConnections = rabbit_misc:get_env(rabbit, connection_max, infinity), {ok, {{one_for_all, 10, 10}, [ ranch:child_spec({acceptor, IPAddress, Port}, ConcurrentAcceptorCount, Transport, [{port, Port}, {ip, IPAddress}, - {max_connections, infinity}, + {max_connections, MaxConnections}, {ack_timeout, AckTimeout}, {connection_type, supervisor}|SocketOpts], ProtoSup, ProtoOpts), |