magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve DNS error messages

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-11-23 12:05:52 -05:00
parent b94eeb9580
commit f15370027e
No known key found for this signature in database
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/service/resolver/actual.rs
View file

@ -4,7 +4,7 @@ use std::{
sync::Arc, sync::Arc,
}; };
use conduit::{debug, debug_error, debug_info, debug_warn, err, trace, Err, Result}; use conduit::{debug, debug_error, debug_info, debug_warn, err, error, trace, Err, Result};
use hickory_resolver::{error::ResolveError, lookup::SrvLookup}; use hickory_resolver::{error::ResolveError, lookup::SrvLookup};
use ipaddress::IPAddress; use ipaddress::IPAddress;
use ruma::ServerName; use ruma::ServerName;
@ -313,7 +313,6 @@ impl super::Service {
Ok(None) Ok(None)
} }
#[allow(clippy::single_match_else)]
fn handle_resolve_error(e: &ResolveError) -> Result<()> { fn handle_resolve_error(e: &ResolveError) -> Result<()> {
use hickory_resolver::error::ResolveErrorKind; use hickory_resolver::error::ResolveErrorKind;
@ -322,10 +321,21 @@ impl super::Service {
.. ..
} => { } => {
// Raise to debug_warn if we can find out the result wasn't from cache // Raise to debug_warn if we can find out the result wasn't from cache
debug!("{e}"); debug!("No DNS records found: {e}");
Ok(()) Ok(())
}, },
_ => Err!(error!("DNS {e}")), ResolveErrorKind::Timeout => {
Err!(warn!("DNS {e}"))
},
ResolveErrorKind::NoConnections => {
error!(
"Your DNS server is overloaded and has ran out of connections. It is strongly recommended you \
remediate this issue to ensure proper federation connectivity."
);
Err!(error!("DNS error: {e}"))
},
_ => Err!(error!("DNS error: {e}")),
} }
} }