diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-04-02 15:00:33 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-04-02 15:00:33 +0100 |
| commit | 81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c (patch) | |
| tree | 9318355f2cec2e8cb1d120dc16934861e8301b38 /src/rabbit.erl | |
| parent | c49f49b27f6309cb768290a753779ce6731c297a (diff) | |
| parent | 85dd778d974c73d70950c773bf8c944d04af0fc2 (diff) | |
| download | rabbitmq-server-git-81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c.tar.gz | |
Merge bug24808.
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), |