diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-03-29 17:43:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-03-29 17:43:13 +0100 |
| commit | 24066e9fcfdc0a7abd403bd62cf9e4c3665f8b6f (patch) | |
| tree | e77ab494ad384cce32313f0ac7bfb3f6c1855e19 /src/rabbit.erl | |
| parent | 9e014251aeef165f1bdc1acb2a6ffd0dbd8262ad (diff) | |
| parent | 4738013b9229e2aeb9622974b12e8707fca40ad8 (diff) | |
| download | rabbitmq-server-git-24066e9fcfdc0a7abd403bd62cf9e4c3665f8b6f.tar.gz | |
Merge bug 23463
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index dd5fb89ce4..eec7e34e8e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -327,7 +327,11 @@ status() -> [{vm_memory_high_watermark, {vm_memory_monitor, get_vm_memory_high_watermark, []}}, {vm_memory_limit, {vm_memory_monitor, - get_memory_limit, []}}]), + get_memory_limit, []}}, + {disk_free_limit, {rabbit_disk_monitor, + get_disk_free_limit, []}}, + {disk_free, {rabbit_disk_monitor, + get_disk_free, []}}]), S3 = rabbit_misc:with_exit_handler( fun () -> [] end, fun () -> [{file_descriptors, file_handle_cache:info()}] end), |