diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index 00d71a08..93c45af9 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -2570,12 +2570,11 @@ fn default_servernameevent_data_cache_capacity() -> u32 { parallelism_scaled_u32(100_000).saturating_add(100_000) } -fn default_stateinfo_cache_capacity() -> u32 { - parallelism_scaled_u32(500).clamp(100, 12000) -} +fn default_stateinfo_cache_capacity() -> u32 { parallelism_scaled_u32(500).clamp(100, 12000) } fn default_roomid_spacehierarchy_cache_capacity() -> u32 { - parallelism_scaled_u32(500).clamp(100, 12000) } + parallelism_scaled_u32(500).clamp(100, 12000) +} fn default_dns_cache_entries() -> u32 { 327680 } @@ -2788,11 +2787,17 @@ fn default_admin_room_tag() -> String { "m.server_notice".to_owned() } #[allow(clippy::as_conversions, clippy::cast_precision_loss)] pub fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) } -pub fn parallelism_scaled_u32(val: u32) -> u32 { val.saturating_mul(sys::available_parallelism() as u32) } +pub fn parallelism_scaled_u32(val: u32) -> u32 { + val.saturating_mul(sys::available_parallelism() as u32) +} -pub fn parallelism_scaled_i32(val: i32) -> i32 { val.saturating_mul(sys::available_parallelism() as i32) } +pub fn parallelism_scaled_i32(val: i32) -> i32 { + val.saturating_mul(sys::available_parallelism() as i32) +} -pub fn parallelism_scaled(val: usize) -> usize { val.saturating_mul(sys::available_parallelism()) } +pub fn parallelism_scaled(val: usize) -> usize { + val.saturating_mul(sys::available_parallelism()) +} fn default_trusted_server_batch_size() -> usize { 256 } diff --git a/src/router/request.rs b/src/router/request.rs index bc8e164d..295a0e4e 100644 --- a/src/router/request.rs +++ b/src/router/request.rs @@ -8,7 +8,7 @@ use axum::{ extract::State, response::{IntoResponse, Response}, }; -use conduwuit::{Result, debug_warn, err, error, trace, info}; +use conduwuit::{Result, debug_warn, err, error, info, trace}; use conduwuit_service::Services; use futures::FutureExt; use http::{Method, StatusCode, Uri}; diff --git a/src/service/resolver/actual.rs b/src/service/resolver/actual.rs index a4326839..548ba816 100644 --- a/src/service/resolver/actual.rs +++ b/src/service/resolver/actual.rs @@ -119,8 +119,12 @@ impl super::Service { async fn actual_dest_2(&self, dest: &ServerName, cache: bool, pos: usize) -> Result { debug!("2: Hostname with included port"); let (host, port) = dest.as_str().split_at(pos); - self.conditional_query_and_cache(host, port.trim_start_matches(':').parse::().unwrap_or(8448), cache) - .await?; + self.conditional_query_and_cache( + host, + port.trim_start_matches(':').parse::().unwrap_or(8448), + cache, + ) + .await?; Ok(FedDest::Named( host.to_owned(), @@ -165,8 +169,12 @@ impl super::Service { ) -> Result { debug!("3.2: Hostname with port in .well-known file"); let (host, port) = delegated.split_at(pos); - self.conditional_query_and_cache(host, port.trim_start_matches(':').parse::().unwrap_or(8448), cache) - .await?; + self.conditional_query_and_cache( + host, + port.trim_start_matches(':').parse::().unwrap_or(8448), + cache, + ) + .await?; Ok(FedDest::Named( host.to_owned(), diff --git a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs index 6a5f8626..cd6d1815 100644 --- a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs +++ b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs @@ -197,8 +197,15 @@ where .await; extremities.push(incoming_pdu.event_id().to_owned()); - if extremities.len() == 0 { info!("Retained zero extremities when upgrading outlier PDU to timeline PDU with {} previous events, event id: {}", incoming_pdu.prev_events.len(), incoming_pdu.event_id) } - + if extremities.len() == 0 { + info!( + "Retained zero extremities when upgrading outlier PDU to timeline PDU with {} \ + previous events, event id: {}", + incoming_pdu.prev_events.len(), + incoming_pdu.event_id + ) + } + debug!( "Retained {} extremities checked against {} prev_events", extremities.len(),