diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-10 12:45:23 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-10 12:45:23 +0000 |
| commit | 31bef22041049a15a3ec9a522ce9168c76e47ab2 (patch) | |
| tree | db1aaba878a370bb1d4dabca34b885a61867d72a /src/rabbit.erl | |
| parent | 18c736636113d27618887ffc3bcc1d7817450b30 (diff) | |
| download | rabbitmq-server-git-31bef22041049a15a3ec9a522ce9168c76e47ab2.tar.gz | |
cosmetic
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e58c808040..e8dc503e4e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -308,11 +308,11 @@ stop_and_halt() -> ok. status() -> - S1 = [{pid, list_to_integer(os:getpid())}, + S1 = [{pid, list_to_integer(os:getpid())}, {running_applications, application:which_applications(infinity)}, - {os, os:type()}, - {erlang_version, erlang:system_info(system_version)}, - {memory, erlang:memory()}], + {os, os:type()}, + {erlang_version, erlang:system_info(system_version)}, + {memory, erlang: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, @@ -320,13 +320,13 @@ status() -> {vm_memory_limit, {vm_memory_monitor, get_memory_limit, []}}]), S3 = [{file_descriptors, file_handle_cache:info()}, - {processes, [{count, erlang:system_info(process_count)}, - {limit, erlang:system_info(process_limit)}]}, - {run_queue, erlang:statistics(run_queue)}, - {uptime, begin - {T,_} = erlang:statistics(wall_clock), - T div 1000 - end}], + {processes, [{count, erlang:system_info(process_count)}, + {limit, erlang:system_info(process_limit)}]}, + {run_queue, erlang:statistics(run_queue)}, + {uptime, begin + {T,_} = erlang:statistics(wall_clock), + T div 1000 + end}], S1 ++ S2 ++ S3. is_running() -> is_running(node()). |