diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-05-24 15:18:57 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-05-24 15:18:57 +0100 |
| commit | 1b823c17054e5e63ea039cd39b186806a368e8bb (patch) | |
| tree | 7905b6c32e9344faf613eb79b262e8046b5340be | |
| parent | 74e34296803726ef6cff499825286d143c77c3b7 (diff) | |
| download | rabbitmq-server-git-1b823c17054e5e63ea039cd39b186806a368e8bb.tar.gz | |
No infinity timeout, we could deadlock with the application controller on shutdown.
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_nodes.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 3cfa21ba9b..2a70f0166a 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, application:which_applications()}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, {memory, rabbit_vm:memory()}], diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index 5640f12add..b52d36e3f0 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -96,7 +96,7 @@ cookie_hash() -> base64:encode_to_string(erlang:md5(atom_to_list(erlang:get_cookie()))). is_running(Node, Application) -> - case rpc:call(Node, application, which_applications, [infinity]) of + case rpc:call(Node, application, which_applications, []) of {badrpc, _} -> false; Apps -> proplists:is_defined(Application, Apps) end. |