diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 00:53:52 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 00:53:52 +0300 |
| commit | 92c2d59b08115f39b281dd7b55eabfeb707e7565 (patch) | |
| tree | baf632ee4bf18123deee05a776766b01c991d2ad /src/rabbit.erl | |
| parent | cd9da9fe1ca76eaec2d72afb402ff5c2afefaaa2 (diff) | |
| parent | 590d717a266922ce76e1b214ea1045408b2401bd (diff) | |
| download | rabbitmq-server-git-92c2d59b08115f39b281dd7b55eabfeb707e7565.tar.gz | |
Merge branch 'master' into rabbitmq-server-988
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 f10eb463ab..4b12e20b47 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -1061,9 +1061,9 @@ ensure_working_fhc() -> end, TestPid = spawn_link(TestFun), %% Because we are waiting for the test fun, abuse the - %% 'mnesia_table_loading_timeout' parameter to find a sane timeout + %% 'mnesia_table_loading_retry_timeout' parameter to find a sane timeout %% value. - Timeout = rabbit_table:wait_timeout(), + Timeout = rabbit_table:retry_timeout(), receive fhc_ok -> ok; {'EXIT', TestPid, Exception} -> throw({ensure_working_fhc, Exception}) |