diff --git a/src/admin/debug/commands.rs b/src/admin/debug/commands.rs index da6514474..91b2ca2d8 100644 --- a/src/admin/debug/commands.rs +++ b/src/admin/debug/commands.rs @@ -1008,22 +1008,22 @@ impl crate::Context<'_> { ); } - let resolver: &MatrixResolver = if no_cache { - &MatrixResolver::new()? - } else { - &self.services.resolver.resolver - }; + let resolver: &MatrixResolver = if no_cache { + &MatrixResolver::new()? + } else { + &self.services.resolver.resolver + }; - let actual = resolver.resolve_server(server_name.as_str()).await?; + let actual = resolver.resolve_server(server_name.as_str()).await?; - let destination = match actual.destination { - | ResolvedDestination::Literal(addr) => addr.to_string(), - | ResolvedDestination::Named(host, port) => format!("{host}:{port}"), - }; + let destination = match actual.destination { + | ResolvedDestination::Literal(addr) => addr.to_string(), + | ResolvedDestination::Named(host, port) => format!("{host}:{port}"), + }; - let msg = format!("Destination: {}\nHostname URI (SNI): {}", destination, actual.host); - self.write_str(&msg).await -} + let msg = format!("Destination: {}\nHostname URI (SNI): {}", destination, actual.host); + self.write_str(&msg).await + } pub(super) async fn memory_stats(&self, opts: Option) -> Result { const OPTS: &str = "abcdefghijklmnopqrstuvwxyz"; diff --git a/src/admin/query/resolver.rs b/src/admin/query/resolver.rs index 37d6797ff..136024033 100644 --- a/src/admin/query/resolver.rs +++ b/src/admin/query/resolver.rs @@ -46,7 +46,7 @@ impl crate::Context<'_> { writeln!(self, "| Server Name | Destination | Hostname | Expires |").await?; writeln!(self, "| ----------- | ----------- | -------- | ------- |").await?; - let mut destinations = self.services.resolver.dns.cache.destinations().boxed(); + let mut destinations = self.services.resolver.dns.cache.destinations().boxed(); while let Some((name, CachedDest { dest, host, expire })) = destinations.next().await { if let Some(server_name) = server_name.as_ref() { @@ -92,14 +92,14 @@ impl crate::Context<'_> { async fn flush_cache(&self, name: Option, all: bool) -> Result { if all { - self.services.resolver.resolver.clear_cache(); - self.services.resolver.dns.cache.clear().await; - writeln!(self, "Resolver caches cleared!").await - } else if let Some(name) = name { - self.services - .resolver - .resolver - .remove_cache_entry(name.as_str()); + self.services.resolver.resolver.clear_cache(); + self.services.resolver.dns.cache.clear().await; + writeln!(self, "Resolver caches cleared!").await + } else if let Some(name) = name { + self.services + .resolver + .resolver + .remove_cache_entry(name.as_str()); self.services.resolver.dns.cache.del_destination(&name); self.services.resolver.dns.cache.del_override(&name); self.write_str(&format!("Cleared {name} from resolver caches!")) diff --git a/src/service/federation/execute.rs b/src/service/federation/execute.rs index dc6206f0b..4ba51c517 100644 --- a/src/service/federation/execute.rs +++ b/src/service/federation/execute.rs @@ -132,11 +132,11 @@ impl super::Service { } let actual = self - .services - .resolver - .resolver - .resolve_server(dest.as_str()) - .await?; + .services + .resolver + .resolver + .resolve_server(dest.as_str()) + .await?; let request = Request::try_from(request.try_into_http_request::>( actual.base_url().as_str(),