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 /src/rabbit.erl | |
| parent | 74e34296803726ef6cff499825286d143c77c3b7 (diff) | |
| download | rabbitmq-server-git-1b823c17054e5e63ea039cd39b186806a368e8bb.tar.gz | |
No infinity timeout, we could deadlock with the application controller on shutdown.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 2 |
1 files changed, 1 insertions, 1 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()}], |