summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-05-28 16:44:26 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-05-28 16:44:26 +0100
commit352df13dddbf8da2c1115f9fce2dcff6b23e2959 (patch)
treee27e0786fbfecf78bed374b0803159743d05e7e1
parent422add5ea8793aa024eca016a6e0045be12e8fd3 (diff)
downloadrabbitmq-server-352df13dddbf8da2c1115f9fce2dcff6b23e2959.tar.gz
Backport 39513c2967ed (Merge of bug24958; [i18n] disk free monitoring on non-english Windows broken)
-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 b1750b61..d9e8e8e4 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());