diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-03-16 16:37:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 16:37:30 +0300 |
| commit | 2ae6ba6578baaef95657d1b90470f848d464eeb7 (patch) | |
| tree | f36b209186ea0bf66c1bbc45fa02b0c875d3265e /src/rabbit.erl | |
| parent | e431a622cd1b018aa2f1eb83d6dba18fbd53b365 (diff) | |
| parent | fc8abae47427eb9ae4347177cc23dd9d4e10ba35 (diff) | |
| download | rabbitmq-server-git-2ae6ba6578baaef95657d1b90470f848d464eeb7.tar.gz | |
Merge pull request #1556 from rabbitmq/vhost-sup-race
Do not try to start a vhost supervisors on not fully booted nodes.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 37b33bd8a4..cde1d0ad07 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -27,6 +27,7 @@ -export([start/2, stop/1, prep_stop/1]). -export([start_apps/1, start_apps/2, stop_apps/1]). -export([log_locations/0, config_files/0, decrypt_config/2]). %% for testing and mgmt-agent +-export([is_booted/1]). -ifdef(TEST). @@ -745,6 +746,13 @@ is_running() -> is_running(node()). is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). +is_booted(Node) -> + case is_booting(Node) of + false -> + is_running(Node); + _ -> false + end. + environment() -> %% The timeout value is twice that of gen_server:call/2. [{A, environment(A)} || |