diff options
| author | Gerhard Lazu <gerhard@users.noreply.github.com> | 2016-12-01 18:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 18:01:37 +0000 |
| commit | 438bb3b260f9b45a1115e0bb07547ecd079d52a4 (patch) | |
| tree | 47c3493ba55322a9cdb9eea879ae95a9b78258f0 /src/rabbit.erl | |
| parent | ad04a73e8ba3157e8b737f1521b1c4946c1d30e6 (diff) | |
| parent | c76fcdbe365c304eeef59eae4b9327dea8f4646f (diff) | |
| download | rabbitmq-server-git-438bb3b260f9b45a1115e0bb07547ecd079d52a4.tar.gz | |
Merge pull request #1038 from rabbitmq/rabbitmq-server-1033
Back ports #1022 (#1023) to stable
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 ddc41bee0c..e5a6f09c56 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -1116,9 +1116,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}) |