diff options
| author | Daniil Fedotov <hairyhum@gmail.com> | 2016-06-03 17:21:47 +0100 |
|---|---|---|
| committer | Daniil Fedotov <hairyhum@gmail.com> | 2016-06-03 17:21:47 +0100 |
| commit | 00ea39d4b92ec327bb6234443863610822766f0a (patch) | |
| tree | ffb80b2c40f92363de050831992169958477e93d /src | |
| parent | 249b7fb84ce52273bfa58ceb9068990151b0dd44 (diff) | |
| parent | f1f7dac2cc37e60c3f6a43b66a96104ec0c5d909 (diff) | |
| download | rabbitmq-server-git-00ea39d4b92ec327bb6234443863610822766f0a.tar.gz | |
Merge pull request #822 from rabbitmq/rabbitmq-server-820
Fixes #820.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2cc353d7b8..a1a70e5ee9 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -489,6 +489,7 @@ await_startup(HaveSeenRabbitBoot) -> status() -> S1 = [{pid, list_to_integer(os:getpid())}, + %% The timeout value used is twice that of gen_server:call/2. {running_applications, rabbit_misc:which_applications()}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, @@ -545,8 +546,9 @@ is_running() -> is_running(node()). is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). environment() -> + %% The timeout value is twice that of gen_server:call/2. [{A, environment(A)} || - {A, _, _} <- lists:keysort(1, application:which_applications())]. + {A, _, _} <- lists:keysort(1, application:which_applications(10000))]. environment(App) -> Ignore = [default_pass, included_applications], |