diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-09 11:03:19 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-09 11:03:19 +0000 |
| commit | f0731cf3ad786ce3de8cf9810f54ac95e6c181ae (patch) | |
| tree | 20d4a3253b827939847312bb76578e3a37b957c3 /src | |
| parent | 0aa1f7e5b8c6eafca9ed19acf9b729403066625a (diff) | |
| parent | 462df5dd6615d1acec23b997f14693e3c449713f (diff) | |
| download | rabbitmq-server-git-f0731cf3ad786ce3de8cf9810f54ac95e6c181ae.tar.gz | |
Merge bug23792 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_networking.erl | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 283d25c716..36f61628b8 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -32,16 +32,6 @@ -include("rabbit.hrl"). -include_lib("kernel/include/inet.hrl"). --define(RABBIT_TCP_OPTS, [ - binary, - {packet, raw}, % no packaging - {reuseaddr, true}, % allow rebind without waiting - {backlog, 128}, % use the maximum listen(2) backlog value - %% {nodelay, true}, % TCP_NODELAY - disable Nagle's alg. - %% {delay_send, true}, - {exit_on_close, false} - ]). - -define(SSL_TIMEOUT, 5). %% seconds -define(FIRST_TEST_BIND_PORT, 10000). @@ -200,7 +190,7 @@ start_listener0({IPAddress, Port, Family, Name}, Protocol, Label, OnConnect) -> rabbit_sup, {Name, {tcp_listener_sup, start_link, - [IPAddress, Port, [Family | ?RABBIT_TCP_OPTS], + [IPAddress, Port, [Family | tcp_opts()], {?MODULE, tcp_listener_started, [Protocol]}, {?MODULE, tcp_listener_stopped, [Protocol]}, OnConnect, Label]}, @@ -315,6 +305,10 @@ hostname() -> cmap(F) -> rabbit_misc:filter_exit_map(F, connections()). +tcp_opts() -> + {ok, Opts} = application:get_env(rabbit, tcp_listen_options), + Opts. + %%-------------------------------------------------------------------- %% There are three kinds of machine (for our purposes). |