From 79297c37b05aa909b0652feb99641ae682ca0765 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Wed, 14 Aug 2024 20:00:24 +0200 Subject: [PATCH] Fixed read replicas --- crates/common/src/manager/config.rs | 1 + crates/store/src/config.rs | 2 +- tests/src/imap/mod.rs | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/common/src/manager/config.rs b/crates/common/src/manager/config.rs index 69860faa..146f8444 100644 --- a/crates/common/src/manager/config.rs +++ b/crates/common/src/manager/config.rs @@ -505,6 +505,7 @@ impl Patterns { Pattern::Include(MatchType::Equal("storage.fts".to_string())), Pattern::Include(MatchType::Equal("storage.directory".to_string())), Pattern::Include(MatchType::Equal("lookup.default.hostname".to_string())), + Pattern::Include(MatchType::Equal("enterprise.license-key".to_string())), ]; } diff --git a/crates/store/src/config.rs b/crates/store/src/config.rs index 11999db0..d660f1e5 100644 --- a/crates/store/src/config.rs +++ b/crates/store/src/config.rs @@ -213,7 +213,7 @@ impl Stores { } } #[cfg(feature = "enterprise")] - "composite-read" | "composite-blob" => { + "sql-read-replica" | "composite-blob" => { composite_stores.push((store_id, protocol)); } unknown => { diff --git a/tests/src/imap/mod.rs b/tests/src/imap/mod.rs index 378db107..cd5d90dc 100644 --- a/tests/src/imap/mod.rs +++ b/tests/src/imap/mod.rs @@ -52,8 +52,8 @@ use utils::config::Config; use crate::{add_test_certs, directory::DirectoryStore, store::TempDir, AssertConfig}; const SERVER: &str = r#" -[server] -hostname = "'imap.example.org'" +[lookup.default] +hostname = "imap.example.org" [server.listener.imap] bind = ["127.0.0.1:9991"] @@ -152,6 +152,11 @@ database = "stalwart" user = "postgres" password = "mysecretpassword" +[store."psql-replica"] +type = "sql-read-replica" +primary = "postgresql" +replicas = "postgresql" + [store."mysql"] type = "mysql" host = "localhost"