diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-09-06 14:00:07 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-09-06 14:00:07 +0100 |
| commit | ce3b8817f421a9954517127998afdfda622a87ae (patch) | |
| tree | eb88cb8fef2d675562f5c2f137b2015447a301b9 | |
| parent | db44b9327945acb82f518ac182854aa87fa1f282 (diff) | |
| download | rabbitmq-server-git-ce3b8817f421a9954517127998afdfda622a87ae.tar.gz | |
Safer status in case broker is busy shutting down
| -rw-r--r-- | src/rabbit.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2403d027e9..1fdcc36687 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -240,12 +240,14 @@ status() -> {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, {memory, erlang:memory()}] ++ - case is_running() of - true -> [{vm_memory_high_watermark, - vm_memory_monitor:get_vm_memory_high_watermark()}, - {vm_memory_limit, vm_memory_monitor:get_memory_limit()}]; - false -> [] - end. + 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()). |