Skip to content
Snippets Groups Projects
Unverified Commit 66a82447 authored by 🥺's avatar 🥺 :transgender_flag:
Browse files

log hostname in DNS error tracing spans

parent 3e64a5c9
No related branches found
No related tags found
1 merge request!636many syncv3 optimisations; database, RocksDB, and misc performance improvements; refactoring and cleanup; fix private read receipt support; and some more bug fixes
......@@ -258,7 +258,7 @@ async fn conditional_query_and_cache_override(
#[tracing::instrument(skip_all, name = "ip")]
async fn query_and_cache_override(&self, overname: &'_ str, hostname: &'_ str, port: u16) -> Result<()> {
match self.resolver.resolver.lookup_ip(hostname.to_owned()).await {
Err(e) => Self::handle_resolve_error(&e),
Err(e) => Self::handle_resolve_error(&e, hostname),
Ok(override_ip) => {
if hostname != overname {
debug_info!("{overname:?} overriden by {hostname:?}");
......@@ -286,7 +286,7 @@ async fn query_srv_record(&self, hostname: &'_ str) -> Result<Option<FedDest>> {
debug!("querying SRV for {hostname:?}");
let hostname = hostname.trim_end_matches('.');
match self.resolver.resolver.srv_lookup(hostname).await {
Err(e) => Self::handle_resolve_error(&e)?,
Err(e) => Self::handle_resolve_error(&e, hostname)?,
Ok(result) => {
return Ok(result.iter().next().map(|result| {
FedDest::Named(
......@@ -304,7 +304,7 @@ async fn query_srv_record(&self, hostname: &'_ str) -> Result<Option<FedDest>> {
Ok(None)
}
fn handle_resolve_error(e: &ResolveError) -> Result<()> {
fn handle_resolve_error(e: &ResolveError, host: &'_ str) -> Result<()> {
use hickory_resolver::error::ResolveErrorKind;
match *e.kind() {
......@@ -312,11 +312,11 @@ fn handle_resolve_error(e: &ResolveError) -> Result<()> {
..
} => {
// Raise to debug_warn if we can find out the result wasn't from cache
debug!("No DNS records found: {e}");
debug!(%host, "No DNS records found: {e}");
Ok(())
},
ResolveErrorKind::Timeout => {
Err!(warn!("DNS {e}"))
Err!(warn!(%host, "DNS {e}"))
},
ResolveErrorKind::NoConnections => {
error!(
......@@ -324,9 +324,9 @@ fn handle_resolve_error(e: &ResolveError) -> Result<()> {
remediate this issue to ensure proper federation connectivity."
);
Err!(error!("DNS error: {e}"))
Err!(error!(%host, "DNS error: {e}"))
},
_ => Err!(error!("DNS error: {e}")),
_ => Err!(error!(%host, "DNS error: {e}")),
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment