From 1fc7c033cb22f8582faa0d0f17ef20ea5018b343 Mon Sep 17 00:00:00 2001 From: timedout Date: Sat, 30 May 2026 18:02:09 +0100 Subject: [PATCH] fix: Don't treat prev outlier upgrades as fetch failures --- src/service/rooms/event_handler/fetch_prev.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/service/rooms/event_handler/fetch_prev.rs b/src/service/rooms/event_handler/fetch_prev.rs index 25fdf9554..9cacf2f40 100644 --- a/src/service/rooms/event_handler/fetch_prev.rs +++ b/src/service/rooms/event_handler/fetch_prev.rs @@ -1,9 +1,8 @@ use std::collections::HashMap; use conduwuit::{ - Event, PduEvent, debug, debug_info, + Event, PduEvent, debug, debug_info, debug_warn, utils::{BoolExt, IterStream, stream::BroadbandExt}, - warn, }; use futures::StreamExt; use ruma::{RoomId, ServerName}; @@ -88,14 +87,16 @@ impl super::Service { .handle_outlier_pdu(origin, create_event, &event_id, room_id, obj, false) .await { - | Ok((pdu, val)) => + | Ok((pdu, val)) => { self.upgrade_outlier_to_timeline_pdu(pdu, val, create_event, origin, room_id) - .await, - | Err(e) => { - warn!("Failed to persist prev_event {event_id}: {e}"); - continue; + .await + .inspect_err(|e| { + debug_warn!("Failed to upgrade prev event {event_id}: {e}"); + }) + .ok(); }, - }?; + | Err(e) => debug_warn!("Failed to persist prev event {event_id}: {e}"), + } } // NOTE because i keep forgetting: the caller persists incoming_pdu.