summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-06-19 16:47:27 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-06-19 16:47:27 +0100
commit11e914df6c7610c2735859980ee4e6db91bf202b (patch)
tree306c4ecc2f495ded97ce88bd3e2c9bbfd9db9a4b
parentf40e9b0eadfb375a367fb8a9927adece2d4a1af3 (diff)
parent6ab8eeb017bb67fd3d1c705d60ac8c2ccbbe45bd (diff)
downloadrabbitmq-server-11e914df6c7610c2735859980ee4e6db91bf202b.tar.gz
Merged bug24992 into default
-rw-r--r--ebin/rabbit_app.in2
-rw-r--r--src/rabbit_disk_monitor.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index ffe112a0..523b54ce 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -19,7 +19,7 @@
{ssl_listeners, []},
{ssl_options, []},
{vm_memory_high_watermark, 0.4},
- {disk_free_limit, {mem_relative, 1.0}},
+ {disk_free_limit, 1000000000}, %% 1GB
{msg_store_index_module, rabbit_msg_store_ets_index},
{backing_queue_module, rabbit_variable_queue},
%% 0 ("no limit") would make a better default, but that
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl
index ed29bd80..58375abb 100644
--- a/src/rabbit_disk_monitor.erl
+++ b/src/rabbit_disk_monitor.erl
@@ -27,7 +27,7 @@
set_check_interval/1, get_disk_free/0]).
-define(SERVER, ?MODULE).
--define(DEFAULT_DISK_CHECK_INTERVAL, 60000).
+-define(DEFAULT_DISK_CHECK_INTERVAL, 10000).
-record(state, {dir,
limit,