diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-06-05 15:53:35 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-06-05 15:53:35 +0100 |
| commit | a8d762e8e87b6893796895df576a0ced19cc1574 (patch) | |
| tree | bcb351950f6bb9a7720eb78ff7d158615f305462 /src/rabbit.erl | |
| parent | 548f560d55de9f6bb0e584f0366e34eb9e2f9126 (diff) | |
| parent | 77b9dc8f07935f5fe474a549f635f1b055f1d74c (diff) | |
| download | rabbitmq-server-git-a8d762e8e87b6893796895df576a0ced19cc1574.tar.gz | |
merge bug25567 into stable
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), |