diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-06-12 11:16:10 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-06-12 11:16:10 +0100 |
| commit | 6b2571b094a3aaca5dc04cb82870f5aff88d0fba (patch) | |
| tree | 7219162f17c0cc6317e6903c5a02d414e63a721c /src/rabbit.erl | |
| parent | cd4b0d8276cb1ce29d0f323f0c093ae87d8b43af (diff) | |
| parent | 4a7ee069f49ca0aaac2624fc408c332f17e953a7 (diff) | |
| download | rabbitmq-server-git-6b2571b094a3aaca5dc04cb82870f5aff88d0fba.tar.gz | |
Merged bug25581
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 3cfa21ba9b..450a7f32d0 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -393,7 +393,7 @@ await_startup() -> status() -> S1 = [{pid, list_to_integer(os:getpid())}, - {running_applications, application:which_applications(infinity)}, + {running_applications, rabbit_misc:which_applications()}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, {memory, rabbit_vm:memory()}], @@ -421,7 +421,7 @@ status() -> is_running() -> is_running(node()). -is_running(Node) -> rabbit_nodes:is_running(Node, rabbit). +is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). environment() -> lists:keysort(1, [P || P = {K, _} <- application:get_all_env(rabbit), |