initial retooling #1

Merged
naturallaw777 merged 1130 commits from staging-dev into stable 2026-05-21 08:10:11 -05:00
Showing only changes of commit 2073303b18 - Show all commits
+7 -7
View File
@@ -2424,19 +2424,19 @@ async def api_services():
# For enabled services that are inactive (e.g. socket-activated PHP-FPM),
# still check domain/port health so status remains consistent with
# other domain services when there are actionable issues.
has_domain_issues_inactive = False
has_domain_issues = False
if needs_domain:
has_domain_issues_inactive = await loop.run_in_executor(
has_domain_issues = await loop.run_in_executor(
None,
_check_domain_health_fast,
domain,
_cached_external_ip,
)
if not has_domain_issues_inactive and domain:
if not has_domain_issues and domain:
cached_reachable = _is_domain_reachable_cached(domain)
if cached_reachable is False:
has_domain_issues_inactive = True
has_port_issues_inactive = False
has_domain_issues = True
has_port_issues = False
if port_requirements:
for p in port_requirements:
ps = _check_port_status(
@@ -2446,9 +2446,9 @@ async def api_services():
firewall_ports,
)
if ps == "closed":
has_port_issues_inactive = True
has_port_issues = True
break
if has_domain_issues_inactive or has_port_issues_inactive:
if has_domain_issues or has_port_issues:
health = "needs_attention"
else:
health = "inactive"