diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-10-06 16:12:13 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-10-06 16:12:13 +0100 |
| commit | f88351e1078750fcfc5f8b8a66bda5a3b1aece12 (patch) | |
| tree | 04aff3de5e70405f7cafdcc283e44a8e80d371b3 /src/rabbit.erl | |
| parent | b1ef2b126a7e59775c28702e3df18be926b33dbe (diff) | |
| parent | cb360e2c53d982631201e5c3fc33589528853cfd (diff) | |
| download | rabbitmq-server-git-f88351e1078750fcfc5f8b8a66bda5a3b1aece12.tar.gz | |
Merged bug24461 into default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 47bc443303..e98ca9be33 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -249,7 +249,13 @@ status() -> {running_applications, application:which_applications(infinity)}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, - {memory, erlang:memory()}]. + {memory, erlang:memory()}] ++ + rabbit_misc:filter_exit_map( + fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end, + [{vm_memory_high_watermark, {vm_memory_monitor, + get_vm_memory_high_watermark, []}}, + {vm_memory_limit, {vm_memory_monitor, + get_memory_limit, []}}]). is_running() -> is_running(node()). |