summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-05-28 12:39:36 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-05-28 12:39:36 +0100
commit4be1d190a719cb32a67adb346e61d69f8e1a41cd (patch)
tree1e7dac070fb1d08ced5c746650ee882d919ef662 /src
parent38e963b91d43de1d19c7054baa89647e6c710d4d (diff)
parent5dd0b08e0c5f26248abedb4b36bef6d7ff9f3e01 (diff)
downloadrabbitmq-server-git-4be1d190a719cb32a67adb346e61d69f8e1a41cd.tar.gz
Merge bug24958
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_monitor.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl
index b1750b61ad..d9e8e8e469 100644
--- a/src/rabbit_disk_monitor.erl
+++ b/src/rabbit_disk_monitor.erl
@@ -178,8 +178,9 @@ parse_free_unix(CommandResult) ->
parse_free_win32(CommandResult) ->
LastLine = lists:last(string:tokens(CommandResult, "\r\n")),
- [_, _Dir, Free, "bytes", "free"] = string:tokens(LastLine, " "),
- list_to_integer(Free).
+ {match, [Free]} = re:run(lists:reverse(LastLine), "(\\d+)",
+ [{capture, all_but_first, list}]),
+ list_to_integer(lists:reverse(Free)).
interpret_limit({mem_relative, R}) ->
round(R * vm_memory_monitor:get_total_memory());