diff options
author | Emile Joubert <emile@rabbitmq.com> | 2012-01-12 17:20:58 +0000 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2012-01-12 17:20:58 +0000 |
commit | 10bf454c95b54a87d86d9fab152862d5856f1b40 (patch) | |
tree | fb1a80e89a4d4b39feed4522ae39d8c731fb3d02 | |
parent | 3eed683bbf9e20359b8fa510f95065c3a1adc4a9 (diff) | |
parent | 8b28d3d7bd421d22e87c2cec52b9d0eb5804742e (diff) | |
download | rabbitmq-server-10bf454c95b54a87d86d9fab152862d5856f1b40.tar.gz |
Merge bug24636 more
-rw-r--r-- | src/rabbit.erl | 8 |
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()). |