summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-31 01:30:08 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-31 01:30:08 +0300
commit67c9b9ce4f9e185baa89af0df7b11c8d8b1b8056 (patch)
treebf7292b587de7757c228392bcd5bba07f96b2672 /Makefile
parente65e740b2a4d800bafd6d2f7e35ec5a9622a86b4 (diff)
parentafe052f5cdd8535c7d4eaec2d7c10435ca7925e7 (diff)
downloadrabbitmq-server-git-67c9b9ce4f9e185baa89af0df7b11c8d8b1b8056.tar.gz
Merge branch 'master' into rabbitmq-server-995
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 16fb2175bc..6068979317 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ define PROJECT_ENV
{tcp_listeners, [5672]},
{num_tcp_acceptors, 10},
{ssl_listeners, []},
- {num_ssl_acceptors, 1},
+ {num_ssl_acceptors, 10},
{ssl_options, []},
{vm_memory_high_watermark, 0.4},
{vm_memory_high_watermark_paging_ratio, 0.5},
@@ -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},
@@ -123,7 +124,9 @@ define PROJECT_ENV
%% either "stop_node" or "continue".
%% by default we choose to not terminate the entire node if one
%% vhost had to shut down, see server#1158 and server#1280
- {vhost_restart_strategy, continue}
+ {vhost_restart_strategy, continue},
+ %% {global, prefetch count}
+ {default_consumer_prefetch, {false, 0}}
]
endef