From d1baaaab48ecf1a8b4a05f31d86f99e48b62ab00 Mon Sep 17 00:00:00 2001 From: timedout Date: Fri, 29 May 2026 20:57:05 +0100 Subject: [PATCH] fix: Don't silence PDU handle logs --- src/api/server/send.rs | 12 +++++++++--- src/service/rooms/membership/mod.rs | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/api/server/send.rs b/src/api/server/send.rs index cdea52eee..bba4fb93e 100644 --- a/src/api/server/send.rs +++ b/src/api/server/send.rs @@ -7,7 +7,7 @@ use std::{ use axum::extract::State; use axum_client_ip::ClientIp; use conduwuit::{ - Err, Error, Result, debug, debug_warn, err, error, + Err, Error, Result, debug, debug_error, debug_warn, err, error, result::LogErr, state_res::lexicographical_topological_sort, trace, @@ -175,8 +175,14 @@ async fn process_inbound_transaction( for (id, result) in &results { if let Err(e) = result { - if matches!(e, Error::BadRequest(ErrorKind::NotFound, _)) { - debug_warn!("Incoming PDU failed {id}: {e:?}"); + match e { + | Error::BadRequest( + ErrorKind::Forbidden | ErrorKind::InvalidParam | ErrorKind::BadJson, + .., + ) => { + debug_warn!("Incoming PDU {id} failed: {e:?}"); + }, + | _ => debug_error!("Incoming PDU {id} failed: {e:?}"), } } } diff --git a/src/service/rooms/membership/mod.rs b/src/service/rooms/membership/mod.rs index e88aa33d6..49271bded 100644 --- a/src/service/rooms/membership/mod.rs +++ b/src/service/rooms/membership/mod.rs @@ -594,6 +594,7 @@ impl Service { .server_in_room(self.services.globals.server_name(), room_id) .await; + let cork = self.services.db.cork_and_flush(); info!("Compressing state from send_join"); let compressed: CompressedState = self .services @@ -669,6 +670,7 @@ impl Service { ) .await; } + drop(cork); Ok(()) }