git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-10 09:32:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat(fed): Something about nicer fed errors

Browse source
This commit is contained in:
nexy7574 2025-08-20 00:56:55 +01:00 • committed by Jacob Taylor
commit b45b630af7
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/service/federation/execute.rs
View file

@ -1,4 +1,8 @@
use std::{fmt::Debug, mem}; use std::{
error::Error as _,
fmt::{Debug, Write},
mem,
};
use bytes::Bytes; use bytes::Bytes;
use conduwuit::{ use conduwuit::{
@ -193,9 +197,9 @@ fn handle_error(
) -> Result { ) -> Result {
if e.is_timeout() || e.is_connect() { if e.is_timeout() || e.is_connect() {
e = e.without_url(); e = e.without_url();
debug_warn!(?url, "network error while sending request: {e:?}"); warn!(?url, "network error while sending federation request: {e:?}");
} else if e.is_redirect() { } else if e.is_redirect() {
debug_error!( warn!(
method = ?method, method = ?method,
url = ?url, url = ?url,
final_url = ?e.url(), final_url = ?e.url(),
@ -207,6 +211,14 @@ fn handle_error(
warn!(?url, "failed to send federation request: {e:?}"); warn!(?url, "failed to send federation request: {e:?}");
} }
let mut nice_error = "Request failed".to_owned();
let mut src = e.source();
while let Some(source) = src {
write!(nice_error, ": {source:?}").expect("writing to string should not fail");
src = source.source();
}
warn!(nice_error, "Federation request error");
Err(e.into()) Err(e.into())
} }