From 5bb8af7a3e4090e625bf326a4610bb1580048a7f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 18:15:30 +0000
Subject: [PATCH] refactor: reuse cached reachability lookup in service health

Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/3208f380-e8fe-4f12-b83c-723ecee6cd4c

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
---
 app/sovran_systemsos_web/server.py | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/sovran_systemsos_web/server.py b/app/sovran_systemsos_web/server.py
index 3b582ef..1e72d6d 100644
--- a/app/sovran_systemsos_web/server.py
+++ b/app/sovran_systemsos_web/server.py
@@ -2378,6 +2378,16 @@ async def api_services():
                     domain = val if val else None
             except OSError:
                 domain = None
+        cached_reachable: bool | None = None
+        domain_reachability = None
+        if needs_domain and domain and enabled:
+            cached_reachable = _is_domain_reachable_cached(domain)
+            if cached_reachable is None:
+                domain_reachability = "checking"
+            elif cached_reachable:
+                domain_reachability = "reachable"
+            else:
+                domain_reachability = "unreachable"
 
         # Compute composite health
         sync_progress: float | None = None
@@ -2400,7 +2410,6 @@ async def api_services():
                         has_port_issues = True
                         break
             has_domain_issues = False
-            cached_reachable: bool | None = None
             if needs_domain:
                 has_domain_issues = await loop.run_in_executor(
                     None,
@@ -2409,15 +2418,12 @@ async def api_services():
                     _cached_external_ip,
                 )
                 if not has_domain_issues and domain:
-                    cached_reachable = _is_domain_reachable_cached(domain)
                     if cached_reachable is False:
                         has_domain_issues = True
             if has_port_issues or has_domain_issues:
                 health = "needs_attention"
             else:
                 if needs_domain and domain:
-                    if cached_reachable is None:
-                        cached_reachable = _is_domain_reachable_cached(domain)
                     health = "checking_reachability" if cached_reachable is None else "healthy"
                 else:
                     health = "healthy"
@@ -2435,7 +2441,6 @@ async def api_services():
             # still check domain/port health so status remains consistent with
             # other domain services when there are actionable issues.
             has_domain_issues = False
-            cached_reachable: bool | None = None
             if needs_domain:
                 has_domain_issues = await loop.run_in_executor(
                     None,
@@ -2444,7 +2449,6 @@ async def api_services():
                     _cached_external_ip,
                 )
                 if not has_domain_issues and domain:
-                    cached_reachable = _is_domain_reachable_cached(domain)
                     if cached_reachable is False:
                         has_domain_issues = True
             has_port_issues = False
@@ -2462,8 +2466,6 @@ async def api_services():
             if has_domain_issues or has_port_issues:
                 health = "needs_attention"
             elif needs_domain and domain:
-                if cached_reachable is None:
-                    cached_reachable = _is_domain_reachable_cached(domain)
                 health = "checking_reachability" if cached_reachable is None else "inactive"
             else:
                 health = "inactive"
@@ -2472,16 +2474,6 @@ async def api_services():
         else:
             health = status  # loading states, etc.
 
-        domain_reachability = None
-        if needs_domain and domain and enabled:
-            cached = _is_domain_reachable_cached(domain)
-            if cached is None:
-                domain_reachability = "checking"
-            elif cached:
-                domain_reachability = "reachable"
-            else:
-                domain_reachability = "unreachable"
-
         service_data: dict = {
             "name": entry.get("name", ""),
             "unit": unit,