oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-27 18:28:31 +00:00
Code Wiki Activity

feat(config): introduce federation connection timeout setting

Browse source 
fixes #906

Signed-off-by: rooot <hey@rooot.gay>
This commit is contained in:
rooot 2025-07-20 03:14:35 +02:00 • committed by Jade Ellis
parent f513cb7598
commit 9051ce63f7
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
3 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
conduwuit-example.toml
View file

@ -325,6 +325,14 @@
# #
#well_known_timeout = 10 #well_known_timeout = 10
# Federation client connection timeout (seconds). You should not set this
# to high values, as dead homeservers can significantly slow down
# federation, specifically key retrieval, which will take roughly the
# amount of time you configure here given that a homeserver doesn't
# respond.
#
#federation_conn_timeout = 10
# Federation client request timeout (seconds). You most definitely want # Federation client request timeout (seconds). You most definitely want
# this to be high to account for extremely large room joins, slow # this to be high to account for extremely large room joins, slow
# homeservers, your own resources etc. # homeservers, your own resources etc.

12
src/core/config/mod.rs
View file

@ -412,6 +412,16 @@ pub struct Config {
#[serde(default = "default_well_known_timeout")] #[serde(default = "default_well_known_timeout")]
pub well_known_timeout: u64, pub well_known_timeout: u64,
/// Federation client connection timeout (seconds). You should not set this
/// to high values, as dead homeservers can significantly slow down
/// federation, specifically key retrieval, which will take roughly the
/// amount of time you configure here given that a homeserver doesn't
/// respond.
///
/// default: 10
#[serde(default = "default_federation_conn_timeout")]
pub federation_conn_timeout: u64,
/// Federation client request timeout (seconds). You most definitely want /// Federation client request timeout (seconds). You most definitely want
/// this to be high to account for extremely large room joins, slow /// this to be high to account for extremely large room joins, slow
/// homeservers, your own resources etc. /// homeservers, your own resources etc.
@ -2193,6 +2203,8 @@ fn default_well_known_conn_timeout() -> u64 { 6 }
fn default_well_known_timeout() -> u64 { 10 } fn default_well_known_timeout() -> u64 { 10 }
fn default_federation_conn_timeout() -> u64 { 10 }
fn default_federation_timeout() -> u64 { 25 } fn default_federation_timeout() -> u64 { 25 }
fn default_federation_idle_timeout() -> u64 { 25 } fn default_federation_idle_timeout() -> u64 { 25 }

3
src/service/client/mod.rs
View file

@ -66,6 +66,7 @@ impl crate::Service for Service {
federation: base(config)? federation: base(config)?
.dns_resolver(resolver.resolver.hooked.clone()) .dns_resolver(resolver.resolver.hooked.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.federation_timeout)) .read_timeout(Duration::from_secs(config.federation_timeout))
.pool_max_idle_per_host(config.federation_idle_per_host.into()) .pool_max_idle_per_host(config.federation_idle_per_host.into())
.pool_idle_timeout(Duration::from_secs(config.federation_idle_timeout)) .pool_idle_timeout(Duration::from_secs(config.federation_idle_timeout))
@ -74,6 +75,7 @@ impl crate::Service for Service {
synapse: base(config)? synapse: base(config)?
.dns_resolver(resolver.resolver.hooked.clone()) .dns_resolver(resolver.resolver.hooked.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(305)) .read_timeout(Duration::from_secs(305))
.pool_max_idle_per_host(0) .pool_max_idle_per_host(0)
.redirect(redirect::Policy::limited(3)) .redirect(redirect::Policy::limited(3))
@ -81,6 +83,7 @@ impl crate::Service for Service {
sender: base(config)? sender: base(config)?
.dns_resolver(resolver.resolver.hooked.clone()) .dns_resolver(resolver.resolver.hooked.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.sender_timeout)) .read_timeout(Duration::from_secs(config.sender_timeout))
.timeout(Duration::from_secs(config.sender_timeout)) .timeout(Duration::from_secs(config.sender_timeout))
.pool_max_idle_per_host(1) .pool_max_idle_per_host(1)