summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-05-25 14:47:34 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-05-25 14:47:34 +0100
commit8822e5bd2e4121c78b677f7b5b62805be126facf (patch)
treecdb9355cdb3ded3f82047d5cedc576eb56fef2ae /src
parentbf96c3de075dac375b8b39c4affbf28f2bc5c56a (diff)
downloadrabbitmq-server-git-8822e5bd2e4121c78b677f7b5b62805be126facf.tar.gz
Parse disk free space in a language-independent manner
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_monitor.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl
index b1750b61ad..f3a553b438 100644
--- a/src/rabbit_disk_monitor.erl
+++ b/src/rabbit_disk_monitor.erl
@@ -178,8 +178,10 @@ 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).
+ {ok, Digits} = re:compile("([0-9]+)"),
+ {match,[Free]} =
+ re:run(lists:reverse(LastLine), Digits, [{capture, all_but_first, list}]),
+ list_to_integer(lists:reverse(Free)).
interpret_limit({mem_relative, R}) ->
round(R * vm_memory_monitor:get_total_memory());