diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-10-18 17:50:43 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-10-18 17:50:43 +0100 |
| commit | 72cf2665acdde2d33adbbd14cf2015505c4bae42 (patch) | |
| tree | ae885f135cc4a6de7f2bd08f920f175243ae3a44 /src/rabbit.erl | |
| parent | 05eb34284c50e74d555092acdcc30c4667aad3ce (diff) | |
| download | rabbitmq-server-git-72cf2665acdde2d33adbbd14cf2015505c4bae42.tar.gz | |
reinstate rabbit_vm:memory/0, accidentally stripped out whilst reverting changes
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2e866ca219..c39383123d 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -369,7 +369,7 @@ status() -> {running_applications, application:which_applications(infinity)}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, - {memory, erlang:memory()}], + {memory, rabbit_vm: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, |