From a7929c19310a7d03ed5c819ddc5b05cb35f81a90 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Tue, 26 Aug 2025 18:36:39 -0700 Subject: [PATCH 1/5] fix warn by removing unused debug imports delete more imports to quiet cargo --- src/api/server/send.rs | 2 +- src/service/federation/execute.rs | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/api/server/send.rs b/src/api/server/send.rs index e7e4e9fd..385477d1 100644 --- a/src/api/server/send.rs +++ b/src/api/server/send.rs @@ -3,7 +3,7 @@ use std::{collections::BTreeMap, net::IpAddr, time::Instant}; use axum::extract::State; use axum_client_ip::InsecureClientIp; use conduwuit::{ - Err, Error, Result, debug, + Err, Error, Result, debug::INFO_SPAN_LEVEL, debug_warn, err, error, info, result::LogErr, diff --git a/src/service/federation/execute.rs b/src/service/federation/execute.rs index 9a3cd828..5fe10ec9 100644 --- a/src/service/federation/execute.rs +++ b/src/service/federation/execute.rs @@ -5,10 +5,7 @@ use std::{ }; use bytes::Bytes; -use conduwuit::{ - Err, Error, Result, debug, debug::INFO_SPAN_LEVEL, err, - error::inspect_debug_log, implement, trace, utils::string::EMPTY, warn, -}; +use conduwuit::{Err, Error, Result, debug, debug::INFO_SPAN_LEVEL, err, error::inspect_debug_log, implement, trace, utils::string::EMPTY, info}; use http::{HeaderValue, header::AUTHORIZATION}; use ipaddress::IPAddress; use reqwest::{Client, Method, Request, Response, Url}; @@ -197,9 +194,9 @@ fn handle_error( ) -> Result { if e.is_timeout() || e.is_connect() { e = e.without_url(); - warn!(?url, "network error while sending federation request: {e:?}"); + trace!(?url, "network error while sending federation request: {e:?}"); } else if e.is_redirect() { - warn!( + trace!( method = ?method, url = ?url, final_url = ?e.url(), @@ -208,7 +205,7 @@ fn handle_error( e, ); } else { - warn!(?url, "failed to send federation request: {e:?}"); + trace!(?url, "failed to send federation request: {e:?}"); } let mut nice_error = "Request failed".to_owned(); @@ -217,7 +214,7 @@ fn handle_error( write!(nice_error, ": {source:?}").expect("writing to string should not fail"); src = source.source(); } - warn!(nice_error, "Federation request error"); + info!(nice_error, "Federation request error"); Err(e.into()) } From e15d71d2303387e55c5f679ba4753ffa930527e3 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Fri, 22 Aug 2025 10:44:31 -0700 Subject: [PATCH 2/5] log which room is being backfilled move more backfill log to info, clean up imports --- src/service/rooms/timeline/backfill.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/service/rooms/timeline/backfill.rs b/src/service/rooms/timeline/backfill.rs index e976981e..d91075e1 100644 --- a/src/service/rooms/timeline/backfill.rs +++ b/src/service/rooms/timeline/backfill.rs @@ -1,13 +1,13 @@ use std::iter::once; use conduwuit_core::{ - Result, debug, debug_warn, implement, info, + Result, debug, implement, info, matrix::{ event::Event, pdu::{PduCount, PduId, RawPduId}, }, utils::{IterStream, ReadyExt}, - validated, warn, + validated, }; use futures::{FutureExt, StreamExt}; use ruma::{ @@ -15,9 +15,7 @@ use ruma::{ api::federation, events::{ StateEventType, TimelineEventType, room::power_levels::RoomPowerLevelsEventContent, - }, - uint, -}; + }, UInt}; use serde_json::value::RawValue as RawJsonValue; use super::ExtractBody; @@ -100,7 +98,7 @@ pub async fn backfill_if_required(&self, room_id: &RoomId, from: PduCount) -> Re .boxed(); while let Some(ref backfill_server) = servers.next().await { - info!("Asking {backfill_server} for backfill"); + info!("Asking {backfill_server} for backfill of room {room_id}"); let response = self .services .sending @@ -109,7 +107,7 @@ pub async fn backfill_if_required(&self, room_id: &RoomId, from: PduCount) -> Re federation::backfill::get_backfill::v1::Request { room_id: room_id.to_owned(), v: vec![first_pdu.1.event_id().to_owned()], - limit: uint!(100), + limit: UInt::from(self.services.server.config.max_fetch_prev_events), }, ) .await; @@ -117,13 +115,13 @@ pub async fn backfill_if_required(&self, room_id: &RoomId, from: PduCount) -> Re | Ok(response) => { for pdu in response.pdus { if let Err(e) = self.backfill_pdu(backfill_server, pdu).boxed().await { - debug_warn!("Failed to add backfilled pdu in room {room_id}: {e}"); + info!("Failed to add backfilled pdu in room {room_id}: {e}"); } } return Ok(()); }, | Err(e) => { - warn!("{backfill_server} failed to provide backfill for room {room_id}: {e}"); + info!("{backfill_server} failed to provide backfill for room {room_id}: {e}"); }, } } From a75eacd54474db2dc5e30c642e3a044ce3d4ef95 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Mon, 25 Aug 2025 20:51:55 -0700 Subject: [PATCH 3/5] reduce log volume (keeps 2 infos) adjust log volume demote a bunch of logs --- src/api/server/send.rs | 6 +++--- .../rooms/event_handler/fetch_and_handle_outliers.rs | 2 +- src/service/sending/sender.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/server/send.rs b/src/api/server/send.rs index 385477d1..601da06c 100644 --- a/src/api/server/send.rs +++ b/src/api/server/send.rs @@ -79,7 +79,7 @@ pub(crate) async fn send_transaction_message_route( } let txn_start_time = Instant::now(); - info!( + trace!( pdus = body.pdus.len(), edus = body.edus.len(), id = ?body.transaction_id, @@ -102,7 +102,7 @@ pub(crate) async fn send_transaction_message_route( .filter_map(Result::ok) .stream(); - info!( + trace!( pdus = body.pdus.len(), edus = body.edus.len(), elapsed = ?txn_start_time.elapsed(), @@ -198,7 +198,7 @@ async fn handle_room( .and_then(|(_, event_id, value)| async move { services.server.check_running()?; let pdu_start_time = Instant::now(); - info!( + trace!( %room_id, %event_id, pdu = n + 1, diff --git a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs index c72cce87..d273a41a 100644 --- a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs +++ b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs @@ -4,7 +4,7 @@ use std::{ }; use conduwuit::{ - Event, PduEvent, debug, debug_error, debug_warn, implement, + Event, PduEvent, debug, debug_error, implement, matrix::event::gen_event_id_canonical_json, trace, utils::continue_exponential_backoff_secs, warn, }; diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 5498afc0..ac82669f 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -882,7 +882,7 @@ impl Service { .execute_on(&self.services.client.sender, &server, request) .await .inspect(|_| { - info!(%txn_id, %server, "Sent {} PDUs, {} EDUs", pdu_count, edu_count); + trace!(%txn_id, %server, "Sent {} PDUs, {} EDUs", pdu_count, edu_count); }) .inspect_err(|e| { info!(%txn_id, %server, "Failed to send transaction ({} PDUs, {} EDUs): {e:?}", pdu_count, edu_count); @@ -890,7 +890,7 @@ impl Service { for (event_id, result) in result.iter().flat_map(|resp| resp.pdus.iter()) { if let Err(e) = result { - warn!( + trace!( %txn_id, %server, "error sending PDU {event_id} to remote server: {e:?}" ); From c83f1ddb7164ddd98e130671d784ca1ed83ec964 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Tue, 26 Aug 2025 18:08:19 -0700 Subject: [PATCH 4/5] add event_id to log entry --- src/service/rooms/event_handler/handle_outlier_pdu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index fad9ac74..3b8653e7 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -123,7 +123,7 @@ where // The original create event must be in the auth events if !auth_events.contains_key(&(StateEventType::RoomCreate, String::new().into())) { - return Err!(Request(InvalidParam("Incoming event refers to wrong create event."))); + return Err!(Request(InvalidParam("Incoming event refers to wrong create event. event_id={event_id}"))); } let state_fetch = |ty: &StateEventType, sk: &str| { From 60b8c9f5f2b92af8997997aa57e870eea9335425 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Tue, 26 Aug 2025 18:42:40 -0700 Subject: [PATCH 5/5] turns out we need debug_warn --- .../rooms/event_handler/fetch_and_handle_outliers.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs index d273a41a..51d10d71 100644 --- a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs +++ b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs @@ -3,11 +3,7 @@ use std::{ time::Instant, }; -use conduwuit::{ - Event, PduEvent, debug, debug_error, implement, - matrix::event::gen_event_id_canonical_json, trace, utils::continue_exponential_backoff_secs, - warn, -}; +use conduwuit::{Event, PduEvent, debug, debug_error, implement, matrix::event::gen_event_id_canonical_json, trace, utils::continue_exponential_backoff_secs, warn, debug_warn}; use ruma::{ CanonicalJsonValue, EventId, OwnedEventId, RoomId, ServerName, api::federation::event::get_event,