root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use vm_memory_monitor when reporting total mem_used 

[#145451399]

rabbitmq/rabbitmq-server#1259

Signed-off-by: Gerhard Lazu <gerhard@rabbitmq.com>
This commit is contained in:
Daniil Fedotov 2017-06-14 13:52:32 +01:00 committed by Gerhard Lazu
parent 279a9553b4
commit 3886a8e9ec
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl vendored
View File

@ -182,7 +182,10 @@ i(sockets_used, _State) ->
i(sockets_total, _State) ->
proplists:get_value(sockets_limit, file_handle_cache:info([sockets_limit]));
i(os_pid, _State) -> list_to_binary(os:getpid());
i(mem_used, _State) -> erlang:memory(total);
i(mem_used, _State) ->
{OsTotal, _} = vm_memory_monitor:get_memory_use(bytes),
OsTotal;
i(mem_limit, _State) -> vm_memory_monitor:get_memory_limit();
i(mem_alarm, _State) -> resource_alarm_set(memory);
i(proc_used, _State) -> erlang:system_info(process_count);