summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-20 19:30:56 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-20 19:30:56 +0300
commite6448b2170fcc48cc6275f917ac025e13c43ddf2 (patch)
tree6e7b063b58c8c877137399f7d647181e24133024
parentae15f7127938c6844acaac9740e7aef83338c793 (diff)
downloadrabbitmq-server-git-e6448b2170fcc48cc6275f917ac025e13c43ddf2.tar.gz
rabbit.max_connections => rabbit.connection_max
We already have rabbit.channel_max, frame_max.
-rw-r--r--Makefile1
-rw-r--r--src/tcp_listener_sup.erl2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f97021920c..5b26d4ec3b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ define PROJECT_ENV
%% breaks the QPid Java client
{frame_max, 131072},
{channel_max, 0},
+ {connection_max, infinity},
{heartbeat, 60},
{msg_store_file_size_limit, 16777216},
{fhc_write_buffering, true},
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl
index ac6e943225..7cb1214c8e 100644
--- a/src/tcp_listener_sup.erl
+++ b/src/tcp_listener_sup.erl
@@ -49,7 +49,7 @@ 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),
+ 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},