diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-10-20 19:20:37 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-10-20 19:20:37 +0300 |
| commit | ae15f7127938c6844acaac9740e7aef83338c793 (patch) | |
| tree | 2a734428962072d9f49a72ccf9d0a959208ab9bd /src | |
| parent | 1409ce20c40bfeeb3d82065119a2caf5f9b7e54e (diff) | |
| parent | a609f291bab1e76cad7b043ab70ce33e7815ce6a (diff) | |
| download | rabbitmq-server-git-ae15f7127938c6844acaac9740e7aef83338c793.tar.gz | |
Merge branch 'max_connections' of https://github.com/cloudamqp/rabbitmq-server into cloudamqp-max_connections
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..ac6e943225 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, max_connections, 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), |