diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-17 10:23:13 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-17 10:23:13 +0400 |
| commit | 07eaccc11cf894f0bb1dae38d119bd31454ddc1a (patch) | |
| tree | 2ba201ca4f74ee5a6fb38a87ed1fda4950548fc2 | |
| parent | 7e2a03c67acdb627a5e64bef16e9df88e1d21a64 (diff) | |
| download | rabbitmq-server-07eaccc11cf894f0bb1dae38d119bd31454ddc1a.tar.gz | |
Make mnesia:wait_for_tables timeout configurable
| -rw-r--r-- | ebin/rabbit_app.in | 1 | ||||
| -rw-r--r-- | src/rabbit_table.erl | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 7360208a..3647c04a 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -39,6 +39,7 @@ {server_properties, []}, {collect_statistics, none}, {collect_statistics_interval, 5000}, + {mnesia_table_loading_timeout, 30000}, {auth_mechanisms, ['PLAIN', 'AMQPLAIN']}, {auth_backends, [rabbit_auth_backend_internal]}, {delegate_count, 16}, diff --git a/src/rabbit_table.erl b/src/rabbit_table.erl index da75932d..dee252e3 100644 --- a/src/rabbit_table.erl +++ b/src/rabbit_table.erl @@ -70,7 +70,8 @@ wait_for_replicated() -> not lists:member({local_content, true}, TabDef)]). wait(TableNames) -> - case mnesia:wait_for_tables(TableNames, 30000) of + Timeout = application:get_env(rabbit, mnesia_table_loading_timeout), + case mnesia:wait_for_tables(TableNames, Timeout) of ok -> ok; {timeout, BadTabs} -> |