summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-09-18 18:29:08 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-09-18 18:29:08 +0100
commitc713245a23fcd0a6d3d6b5272181c7fb79d7b56f (patch)
tree9e0dd0a8317ab440a9924761917f635162071b22 /src/rabbit.erl
parent0ea7e3149d81d1f52d744ca4f5ece15c375fa789 (diff)
downloadrabbitmq-server-git-c713245a23fcd0a6d3d6b5272181c7fb79d7b56f.tar.gz
Try to keep our categories disjoint.
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 3809c07943..ff908b7564 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -356,7 +356,8 @@ status() ->
{running_applications, application:which_applications(infinity)},
{os, os:type()},
{erlang_version, erlang:system_info(system_version)},
- {memory, rabbit_misc:memory()}],
+ {memory_used, erlang:memory(total)},
+ {memory_details, rabbit_misc:memory()}],
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,