diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-17 16:25:59 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-17 16:25:59 +0300 |
| commit | 78ac7fb591753c34c6c8cc87f31544a20d878af0 (patch) | |
| tree | 165bcd01cf7beea88d2b19c5929c6d80630ae9cd | |
| parent | 47b2d490f431112cd8b03aa35ef48c346a011a46 (diff) | |
| parent | a439b5f851380b5518e3a212cd31ac73db823c32 (diff) | |
| download | rabbitmq-server-git-78ac7fb591753c34c6c8cc87f31544a20d878af0.tar.gz | |
Merge branch 'master' into rabbitmq-server-msg-store-recovery-optimize
| -rw-r--r-- | src/rabbit_priority_queue.erl | 2 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/snippets.config | 28 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl index b7a3afd129..34e23260ba 100644 --- a/src/rabbit_priority_queue.erl +++ b/src/rabbit_priority_queue.erl @@ -657,7 +657,7 @@ cse(_, lazy) -> lazy; cse(lazy, _) -> lazy; %% numerical stats cse(A, B) when is_number(A) -> A + B; -cse({delta, _, _, _}, _) -> {delta, todo, todo, todo}; +cse({delta, _, _, _, _}, _) -> {delta, todo, todo, todo, todo}; cse(A, B) -> exit({A, B}). %% When asked about 'head_message_timestamp' fro this priority queue, we diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config index 9fb0b7519b..150ccfac5c 100644 --- a/test/config_schema_SUITE_data/snippets.config +++ b/test/config_schema_SUITE_data/snippets.config @@ -897,6 +897,32 @@ auth_cache.cached_backend = ldap", "proxy_protocol = false", [{rabbit, [ {proxy_protocol, false} -]}],[]} +]}],[]}, +{trust_store, + "trust_store.refresh_interval = 30", + [{rabbitmq_trust_store, [{refresh_interval, 30}]}], + [rabbitmq_trust_store]}, +{trust_store_file, + "trust_store.directory = /tmp/foo/bar", + [{rabbitmq_trust_store, [{directory, "/tmp/foo/bar"}]}], + [rabbitmq_trust_store]}, +{trust_store_providers, + "trust_store.providers.1 = file + trust_store.providers.2 = http + trust_store.providers.3 = rabbit_trust_store_opera_com_provider", + [{rabbitmq_trust_store, [{providers, [rabbit_trust_store_file_provider, + rabbit_trust_store_http_provider, + rabbit_trust_store_opera_com_provider]}]}], + [rabbitmq_trust_store]}, +{trust_store_http, + "trust_store.providers.1 = http + trust_store.url = http://example.com + trust_store.ssl_options.certfile = test/config_schema_SUITE_data/certs/cert.pem + trust_store.ssl_options.password = i_am_password", + [{rabbitmq_trust_store, [{providers, [rabbit_trust_store_http_provider]}, + {url, "http://example.com"}, + {ssl_options, [{certfile, "test/config_schema_SUITE_data/certs/cert.pem"}, + {password, "i_am_password"}]}]}], + [rabbitmq_trust_store]} ]. |