diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2017-05-03 12:29:52 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2017-05-03 12:29:52 +0100 |
| commit | 6b13679b725ec12aee2569f07ac15618eb99a34b (patch) | |
| tree | f29e1d7e3d66cbb80c6a3c3c92a81e3506866ab3 /src | |
| parent | f580a7652166a4836b0fbbe881c3f6e6a5b49f36 (diff) | |
| parent | 8cedd3f53a14e45ccc68868bbc6401bb321ee50f (diff) | |
| download | rabbitmq-server-git-6b13679b725ec12aee2569f07ac15618eb99a34b.tar.gz | |
Merge remote-tracking branch 'origin/stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index 629228a1be..868fc1a4aa 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -75,7 +75,7 @@ %%---------------------------------------------------------------------------- --type disk_free_limit() :: (integer() | string() | {'mem_relative', float()}). +-type disk_free_limit() :: (integer() | string() | {'mem_relative', float() | integer()}). -spec start_link(disk_free_limit()) -> rabbit_types:ok_pid_or_error(). -spec get_disk_free_limit() -> integer(). -spec set_disk_free_limit(disk_free_limit()) -> 'ok'. @@ -237,7 +237,7 @@ parse_free_win32(CommandResult) -> list_to_integer(lists:reverse(Free)). interpret_limit({mem_relative, Relative}) - when is_float(Relative) -> + when is_number(Relative) -> round(Relative * vm_memory_monitor:get_total_memory()); interpret_limit(Absolute) -> case rabbit_resource_monitor_misc:parse_information_unit(Absolute) of |