diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-06-19 16:47:27 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-06-19 16:47:27 +0100 |
| commit | a9cc8c53ed14d83c56bc4a48be58bea287b534a8 (patch) | |
| tree | 306c4ecc2f495ded97ce88bd3e2c9bbfd9db9a4b | |
| parent | dd3b408045304969b0cbce6ccdc27284c6de2ca1 (diff) | |
| parent | 024f4e5735276cb139010f8589cb278c161bebdc (diff) | |
| download | rabbitmq-server-git-a9cc8c53ed14d83c56bc4a48be58bea287b534a8.tar.gz | |
Merged bug24992 into default
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index ffe112a0e2..523b54ced1 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 ed29bd80b9..58375abb45 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, |