Rustfmt

src/maestro/me_startup.rs

@@ -30,7 +30,10 @@ where
     loop {
         let result = AbortOnDropHandle::new(tokio::spawn(task())).await;
         match result {
-            Ok(()) => warn!(task = task_name, "Middle-End supervisor task exited unexpectedly, restarting"),
+            Ok(()) => warn!(
+                task = task_name,
+                "Middle-End supervisor task exited unexpectedly, restarting"
+            ),
             Err(error) => {
                 error!(task = task_name, error = %error, "Middle-End supervisor task panicked, restarting in 1s");
                 tokio::time::sleep(Duration::from_secs(1)).await;

src/maestro/tls_bootstrap.rs

@@ -39,11 +39,7 @@ impl TlsFetchContext {
         let mut join = tokio::task::JoinSet::new();
         for domain in self.domains.clone() {
             let cache = self.cache.clone();
-            let host = tls_fetch_host_for_domain(
+            let host = tls_fetch_host_for_domain(&self.mask_host, &self.primary_domain, &domain);
-                &self.mask_host,
-                &self.primary_domain,
-                &domain,
-            );
             let unix_sock = self.mask_unix_sock.clone();
             let scope = self.tls_fetch_scope.clone();
             let upstream = self.upstream_manager.clone();

src/tls_front/cache.rs

@@ -196,11 +196,7 @@ impl TlsFrontCache {
         domains
             .iter()
             .filter(|domain| {
-                guard
+                guard.get(domain.as_str()).unwrap_or(&self.default).domain == "default"
-                    .get(domain.as_str())
-                    .unwrap_or(&self.default)
-                    .domain
-                    == "default"
             })
             .cloned()
             .collect()