diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-10-14 14:30:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 14:30:39 +0200 |
| commit | 32762100e8b9b7a36d681fa59602c3fa9e065a31 (patch) | |
| tree | c47697129a39485a4b5f41d793e0706474ca40d5 /src/rabbit.app.src | |
| parent | 3769343e713d52a5a3cb6a9218686432831e06e4 (diff) | |
| parent | 23d84850f8fe3d4b7f99c7635f0b81eab312bbbf (diff) | |
| download | rabbitmq-server-git-32762100e8b9b7a36d681fa59602c3fa9e065a31.tar.gz | |
Merge pull request #989 from rabbitmq/rabbitmq-server-486
Switch config-driven autoclustering to rabbit_peer_discovery_backend
Diffstat (limited to 'src/rabbit.app.src')
| -rw-r--r-- | src/rabbit.app.src | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 4638c20ff4..b22ef7ae5b 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -44,7 +44,6 @@ {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, {loopback_users, [<<"guest">>]}, {password_hashing_module, rabbit_password_hashing_sha256}, - {cluster_nodes, {[], disc}}, {server_properties, []}, {collect_statistics, none}, {collect_statistics_interval, 5000}, @@ -103,12 +102,19 @@ %% see rabbitmq-server#248 %% and rabbitmq-server#667 {channel_operation_timeout, 15000}, + + %% see rabbitmq-server#486 + {peer_discovery_backend, rabbit_peer_discovery_classic_config}, + %% used by rabbit_peer_discovery_classic_config + {cluster_nodes, {[], disc}}, + {decoder_config, [ {cipher, aes_cbc256}, {hash, sha512}, {iterations, 1000}, {passphrase, undefined} ]}, + %% rabbitmq-server-973 {lazy_queue_explicit_gc_run_operation_threshold, 250} ]}]}. |