diff options
| author | Loïc Hoguin <essen@ninenines.eu> | 2016-01-12 10:36:38 +0100 |
|---|---|---|
| committer | Loïc Hoguin <essen@ninenines.eu> | 2016-01-12 11:25:57 +0100 |
| commit | ce484f2fa970b9fe7fe542ccedbfef7564b9de40 (patch) | |
| tree | a993fc01bf74924a58c9a1e01a5186e2b5533c9c | |
| parent | 03fd0c2d35e82ed02c9fe615502e6b78c6ee9a1b (diff) | |
| download | rabbitmq-server-git-ce484f2fa970b9fe7fe542ccedbfef7564b9de40.tar.gz | |
Make number of Ranch acceptors configurable
| -rw-r--r-- | docs/rabbitmq.config.example | 18 | ||||
| -rw-r--r-- | src/rabbit.app.src | 2 | ||||
| -rw-r--r-- | src/tcp_listener_sup.erl | 11 |
3 files changed, 21 insertions, 10 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 55c5736994..f7477abe61 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -27,6 +27,12 @@ %% %% {ssl_listeners, [5671]}, + %% Number of Erlang processes that will accept connections for the TCP + %% and SSL listeners. + %% + %% {num_tcp_acceptors, 10}, + %% {num_ssl_acceptors, 1}, + %% Maximum time for AMQP 0-8/0-9/0-9-1 handshake (after socket connection %% and SSL handshake), in milliseconds. %% @@ -428,6 +434,12 @@ %% Listen for SSL connections on a specific port. %% {ssl_listeners, [61614]}, + %% Number of Erlang processes that will accept connections for the TCP + %% and SSL listeners. + %% + %% {num_tcp_acceptors, 10}, + %% {num_ssl_acceptors, 1}, + %% Additional SSL options %% Extract a name from the client's certificate when using SSL. @@ -499,6 +511,12 @@ %% {tcp_listeners, [1883]}, %% {ssl_listeners, []}, + %% Number of Erlang processes that will accept connections for the TCP + %% and SSL listeners. + %% + %% {num_tcp_acceptors, 10}, + %% {num_ssl_acceptors, 1}, + %% TCP/Socket options (as per the broker configuration). %% %% {tcp_listen_options, [{backlog, 128}, diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 18726c71e8..4ee0191138 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -14,7 +14,9 @@ %% in here as we don't actually want to start it {mod, {rabbit, []}}, {env, [{tcp_listeners, [5672]}, + {num_tcp_acceptors, 10}, {ssl_listeners, []}, + {num_ssl_acceptors, 1}, {ssl_options, []}, {vm_memory_high_watermark, 0.4}, {vm_memory_high_watermark_paging_ratio, 0.5}, diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl index 32ec293a00..98a7c890d9 100644 --- a/src/tcp_listener_sup.erl +++ b/src/tcp_listener_sup.erl @@ -25,7 +25,7 @@ -behaviour(supervisor). --export([start_link/9, start_link/10]). +-export([start_link/10]). -export([init/1]). @@ -35,10 +35,6 @@ -type(mfargs() :: {atom(), atom(), [any()]}). --spec(start_link/9 :: - (inet:ip_address(), inet:port_number(), module(), [gen_tcp:listen_option()], - module(), any(), mfargs(), mfargs(), string()) -> - rabbit_types:ok_pid_or_error()). -spec(start_link/10 :: (inet:ip_address(), inet:port_number(), module(), [gen_tcp:listen_option()], module(), any(), mfargs(), mfargs(), integer(), string()) -> @@ -49,11 +45,6 @@ %%---------------------------------------------------------------------------- start_link(IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, OnShutdown, - Label) -> - start_link(IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, OnShutdown, - 1, Label). - -start_link(IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, OnShutdown, ConcurrentAcceptorCount, Label) -> supervisor:start_link( ?MODULE, {IPAddress, Port, Transport, SocketOpts, ProtoSup, ProtoOpts, OnStartup, OnShutdown, |