summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-01-12 15:30:17 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-01-12 15:30:17 +0000
commit8b28d3d7bd421d22e87c2cec52b9d0eb5804742e (patch)
tree37a4ade674a5efdeb7feccf574f21195a452501e
parent1e3050fe1c9d12dfad945859e5c6b31ad9b23bff (diff)
downloadrabbitmq-server-8b28d3d7bd421d22e87c2cec52b9d0eb5804742e.tar.gz
-rw-r--r--src/rabbit.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 7b4a501c..607033cb 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -319,15 +319,17 @@ status() ->
get_vm_memory_high_watermark, []}},
{vm_memory_limit, {vm_memory_monitor,
get_memory_limit, []}}]),
- S3 = [{file_descriptors, file_handle_cache:info()},
- {processes, [{limit, erlang:system_info(process_limit)},
+ S3 = rabbit_misc:with_exit_handler(
+ fun () -> [] end,
+ fun () -> [{file_descriptors, file_handle_cache:info()}] end),
+ S4 = [{processes, [{limit, erlang:system_info(process_limit)},
{used, erlang:system_info(process_count)}]},
{run_queue, erlang:statistics(run_queue)},
{uptime, begin
{T,_} = erlang:statistics(wall_clock),
T div 1000
end}],
- S1 ++ S2 ++ S3.
+ S1 ++ S2 ++ S3 ++ S4.
is_running() -> is_running(node()).