diff --git a/src/service/federation/execute.rs b/src/service/federation/execute.rs index 8be1befa..1d1d1154 100644 --- a/src/service/federation/execute.rs +++ b/src/service/federation/execute.rs @@ -3,7 +3,7 @@ use std::{fmt::Debug, mem}; use bytes::Bytes; use conduwuit::{ Err, Error, Result, debug, debug::INFO_SPAN_LEVEL, debug_error, debug_warn, err, - error::inspect_debug_log, implement, trace, utils::string::EMPTY, warn, + error::inspect_debug_log, implement, trace, utils::string::EMPTY, }; use http::{HeaderValue, header::AUTHORIZATION}; use ipaddress::IPAddress; @@ -193,7 +193,7 @@ fn handle_error( ) -> Result { if e.is_timeout() || e.is_connect() { e = e.without_url(); - debug_warn!(?url, "network error while sending request: {e:?}"); + debug_warn!("{e:?}"); } else if e.is_redirect() { debug_error!( method = ?method, @@ -204,7 +204,7 @@ fn handle_error( e, ); } else { - warn!(?url, "failed to send federation request: {e:?}"); + debug_error!("{e:?}"); } Err(e.into()) diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 5498afc0..a708f746 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -10,7 +10,7 @@ use std::{ use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; use conduwuit_core::{ - Error, Event, Result, debug, err, error, info, + Error, Event, Result, debug, err, error, result::LogErr, trace, utils::{ @@ -142,7 +142,7 @@ impl Service { } fn handle_response_err(dest: Destination, statuses: &mut CurTransactionStatus, e: &Error) { - debug!(dest = ?dest, "error response: {e:?}"); + debug!(dest = ?dest, "{e:?}"); statuses.entry(dest).and_modify(|e| { *e = match e { | TransactionStatus::Running => TransactionStatus::Failed(1, Instant::now()), @@ -177,21 +177,7 @@ impl Service { if !new_events.is_empty() { self.db.mark_as_active(new_events.iter()); - let new_events_vec: Vec = - new_events.into_iter().map(|(_, event)| event).collect(); - - if let Some(status) = statuses.get(&dest.clone()) { - if matches!(status, TransactionStatus::Running) { - // If the server is in backoff, clear it - info!( - ?dest, - "Catching up previously failed destination with {}+ new events", - new_events_vec.len() - ); - statuses.insert(dest.clone(), TransactionStatus::Running); - } - } - + let new_events_vec = new_events.into_iter().map(|(_, event)| event).collect(); futures.push(self.send_events(dest.clone(), new_events_vec)); } else { statuses.remove(dest); @@ -873,20 +859,12 @@ impl Service { pdus, edus, }; - let pdu_count = request.pdus.len(); - let edu_count = request.edus.len(); let result = self .services .federation .execute_on(&self.services.client.sender, &server, request) - .await - .inspect(|_| { - info!(%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); - }); + .await; for (event_id, result) in result.iter().flat_map(|resp| resp.pdus.iter()) { if let Err(e) = result {