summaryrefslogtreecommitdiff
path: root/src/rabbit.app.src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2015-11-19 20:00:46 +0300
committerMichael Klishin <michael@clojurewerkz.org>2015-11-19 20:00:46 +0300
commitc784148b98efc119424ca20541d454540cef5552 (patch)
tree5a2c5401770db55935f39f925f5459ea70c07b6b /src/rabbit.app.src
parentadba722864340e520b30a4d02e7cfccd4ec9e459 (diff)
parentc473264336b4ad8d9f7f6e013b577c26137f8d70 (diff)
downloadrabbitmq-server-git-c784148b98efc119424ca20541d454540cef5552.tar.gz
Merge branch 'master' into rabbitmq-server-429
Diffstat (limited to 'src/rabbit.app.src')
-rw-r--r--src/rabbit.app.src6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src
index fe9b1635ea..ab25c9e089 100644
--- a/src/rabbit.app.src
+++ b/src/rabbit.app.src
@@ -8,7 +8,6 @@
rabbit_node_monitor,
rabbit_router,
rabbit_sup,
- rabbit_tcp_client_sup,
rabbit_direct_client_sup]},
{applications, [kernel, stdlib, sasl, mnesia, os_mon, xmerl]},
%% we also depend on crypto, public_key and ssl but they shouldn't be
@@ -57,10 +56,7 @@
{reverse_dns_lookups, false},
{cluster_partition_handling, ignore},
{cluster_keepalive_interval, 10000},
- {tcp_listen_options, [binary,
- {packet, raw},
- {reuseaddr, true},
- {backlog, 128},
+ {tcp_listen_options, [{backlog, 128},
{nodelay, true},
{linger, {true, 0}},
{exit_on_close, false}]},