diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-01-12 16:24:05 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-01-12 16:24:05 +0300 |
| commit | 636142506ccf1fb65058fe0ae8d997edcc25af65 (patch) | |
| tree | 2e6ea6ecebf4fee3a0d6c3abcdbaa1deb9ee09d8 /src | |
| parent | d76f9188e1f6170ca09cace5b8593ed37757ff81 (diff) | |
| parent | 86db8bccc9530e40105a0969e3c0fd09c82fc93d (diff) | |
| download | rabbitmq-server-git-636142506ccf1fb65058fe0ae8d997edcc25af65.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.app.src | 2 | ||||
| -rw-r--r-- | src/tcp_listener_sup.erl | 11 |
2 files changed, 3 insertions, 10 deletions
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, |