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 | 919f1011640f8a95a52376ddad85d42da5d0f580 (patch) | |
| tree | ae885f135cc4a6de7f2bd08f920f175243ae3a44 | |
| parent | 3afed654e36d398054057fc0b830048d40cc3a83 (diff) | |
| download | rabbitmq-server-bug25205.tar.gz | |
reinstate rabbit_vm:memory/0, accidentally stripped out whilst reverting changesbug25205
| -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 2e866ca2..c3938312 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, |