summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-07-11 17:14:21 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-07-11 17:14:21 +0300
commitc7c3f921163f539dc30758f1ef1bd67e8a473144 (patch)
treebdc0c02b0cc33b71bff26a8be0c7b42420e42ad6 /src/rabbit.erl
parent6f374fb48a5cc9972ce0bfcf747faa380e1d1e4d (diff)
downloadrabbitmq-server-git-c7c3f921163f539dc30758f1ef1bd67e8a473144.tar.gz
Add vm_memory_calculation_strategy to ctl status
How total amount of memory is computed is an important piece of information: what the runtime reports and what tools such as 'ps' report will differ. http://erlang.org/pipermail/erlang-questions/2012-September/069337.html is a good source of information on some of the discrepancies.
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 150b5fb82d..fbd8840c38 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -640,7 +640,8 @@ status() ->
{erlang_version, erlang:system_info(system_version)},
{memory, rabbit_vm:memory()},
{alarms, alarms()},
- {listeners, listeners()}],
+ {listeners, listeners()},
+ {vm_memory_calculation_strategy, vm_memory_monitor:get_memory_calculation_strategy()}],
S2 = rabbit_misc:filter_exit_map(
fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end,
[{vm_memory_high_watermark, {vm_memory_monitor,