diff --git a/src/api/server_server.rs b/src/api/server_server.rs index f1fdd412..b3f07300 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -130,10 +130,11 @@ impl FedDest { } } -#[tracing::instrument(skip(request), fields(url))] +#[tracing::instrument(skip(request, log_error), fields(url))] pub(crate) async fn send_request( destination: &ServerName, request: T, + log_error: bool, ) -> Result where T: OutgoingRequest + Debug, @@ -330,10 +331,12 @@ where } } Err(e) => { - warn!( - error = %e, - "Could not send request", - ); + if log_error { + warn!( + error = %e, + "Could not send request", + ); + } Err(e.into()) } } diff --git a/src/service/sending.rs b/src/service/sending.rs index 03593208..c46f26d7 100644 --- a/src/service/sending.rs +++ b/src/service/sending.rs @@ -286,8 +286,8 @@ impl Service { })) } } - Err(_err) => { - warn!("Marking transaction as failed"); + Err(error) => { + warn!(%error, "Marking transaction as failed"); current_transaction_status.entry(destination).and_modify(|e| { *e = match e { TransactionStatus::Running => { @@ -684,7 +684,7 @@ impl Service { debug!("Got permit"); let response = tokio::time::timeout( Duration::from_secs(2 * 60), - server_server::send_request(destination, request), + server_server::send_request(destination, request, true), ) .await .map_err(|_| { @@ -920,6 +920,7 @@ async fn handle_federation_event( )) .into(), }, + false, ) .await?;