From 0ce356c45aafb0d15b6b0a7c07c86f4c1a203717 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Wed, 28 Jul 2021 16:41:35 +0200 Subject: [PATCH] Add configuration for the presence database --- dendrite-config.yaml | 5 +++++ setup/config/config_userapi.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dendrite-config.yaml b/dendrite-config.yaml index 31b830663..7feb908e3 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -361,6 +361,11 @@ user_api: max_open_conns: 10 max_idle_conns: 2 conn_max_lifetime: -1 + presence_database: + connection_string: file:userapi_presence.db + max_open_conns: 10 + max_idle_conns: 2 + conn_max_lifetime: -1 # The length of time that a token issued for a relying party from # /_matrix/client/r0/user/{userId}/openid/request_token endpoint # is considered to be valid in milliseconds. diff --git a/setup/config/config_userapi.go b/setup/config/config_userapi.go index 2bf1be3dd..70a0d0f57 100644 --- a/setup/config/config_userapi.go +++ b/setup/config/config_userapi.go @@ -19,6 +19,8 @@ type UserAPI struct { // The Device database stores session information for the devices of logged // in local users. It is accessed by the UserAPI. DeviceDatabase DatabaseOptions `yaml:"device_database"` + // The presence database stores information about user (local and remote) presence status. + PresenceDatabase DatabaseOptions `yaml:"presence_database"` } const DefaultOpenIDTokenLifetimeMS = 3600000 // 60 minutes @@ -30,6 +32,7 @@ func (c *UserAPI) Defaults() { c.DeviceDatabase.Defaults(10) c.AccountDatabase.ConnectionString = "file:userapi_accounts.db" c.DeviceDatabase.ConnectionString = "file:userapi_devices.db" + c.PresenceDatabase.ConnectionString = "file:userapi_presence.db" c.BCryptCost = bcrypt.DefaultCost c.OpenIDTokenLifetimeMS = DefaultOpenIDTokenLifetimeMS } @@ -39,5 +42,6 @@ func (c *UserAPI) Verify(configErrs *ConfigErrors, isMonolith bool) { checkURL(configErrs, "user_api.internal_api.connect", string(c.InternalAPI.Connect)) checkNotEmpty(configErrs, "user_api.account_database.connection_string", string(c.AccountDatabase.ConnectionString)) checkNotEmpty(configErrs, "user_api.device_database.connection_string", string(c.DeviceDatabase.ConnectionString)) + checkNotEmpty(configErrs, "user_api.presence_database.connection_string", string(c.PresenceDatabase.ConnectionString)) checkPositive(configErrs, "user_api.openid_token_lifetime_ms", c.OpenIDTokenLifetimeMS) }