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.app.src | |
| 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.app.src')
| -rw-r--r-- | src/rabbit.app.src | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index c06f7630fa..250b14bc32 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -12,7 +12,7 @@ rabbit_direct_client_sup]}, %% FIXME: Remove goldrush, once rabbit_plugins.erl knows how to ignore %% indirect dependencies of rabbit. - {applications, [kernel, stdlib, sasl, mnesia, goldrush, lager, rabbit_common, ranch, os_mon, xmerl]}, + {applications, [kernel, stdlib, sasl, mnesia, goldrush, lager, rabbit_common, ranch, os_mon, xmerl, jsx]}, %% we also depend on crypto, public_key and ssl but they shouldn't be %% in here as we don't actually want to start it {mod, {rabbit, []}}, @@ -47,7 +47,8 @@ {server_properties, []}, {collect_statistics, none}, {collect_statistics_interval, 5000}, - {mnesia_table_loading_timeout, 30000}, + {mnesia_table_loading_retry_timeout, 30000}, + {mnesia_table_loading_retry_limit, 10}, {auth_mechanisms, ['PLAIN', 'AMQPLAIN']}, {auth_backends, [rabbit_auth_backend_internal]}, {delegate_count, 16}, |