From 565d91571b3b6ea052d5709c53383b2fc23bbf17 Mon Sep 17 00:00:00 2001 From: chrisfu Date: Sat, 6 Dec 2025 00:33:49 -0800 Subject: [PATCH] removed pi.prole.org from statusView -- very hardcoded still --- prole-app/Sources/Config.swift | 5 ----- prole-app/Sources/ServiceChecker.swift | 5 +---- prole-app/Sources/StatusView.swift | 2 +- prole-app/prole.properties | 2 -- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/prole-app/Sources/Config.swift b/prole-app/Sources/Config.swift index 40ff95d..726f957 100644 --- a/prole-app/Sources/Config.swift +++ b/prole-app/Sources/Config.swift @@ -14,8 +14,6 @@ final class Config { "svc.port": "443", "k3s.retropie.host": "retropie.prole.org", "k3s.retropie.port": "6443", - "k3s.pi.host": "pi.prole.org", - "k3s.pi.port": "6443", "k3d.local.host": "localhost", "k3d.local.port": "6443" ] @@ -63,9 +61,6 @@ final class Config { var retropieHost: String { string("k3s.retropie.host", default: "retropie.prole.org") } var retropiePort: Int { int("k3s.retropie.port", default: 6443) } - var piHost: String { string("k3s.pi.host", default: "pi.prole.org") } - var piPort: Int { int("k3s.pi.port", default: 6443) } - var localHost: String { string("k3d.local.host", default: "localhost") } var localPort: Int { int("k3d.local.port", default: 6443) } diff --git a/prole-app/Sources/ServiceChecker.swift b/prole-app/Sources/ServiceChecker.swift index 843960a..d915898 100644 --- a/prole-app/Sources/ServiceChecker.swift +++ b/prole-app/Sources/ServiceChecker.swift @@ -1,4 +1,5 @@ import Foundation + import Network final class ServiceChecker { @@ -56,9 +57,6 @@ final class ServiceChecker { group.enter(); tcpPing(host: cfg.retropieHost, port: UInt16(cfg.retropiePort)) { [weak self] ok, ms, err in self?.raspberryReachable = ok; self?.raspberryLatency = ms; self?.raspberryError = err; group.leave() } - group.enter(); tcpPing(host: cfg.piHost, port: UInt16(cfg.piPort)) { [weak self] ok, ms, err in - self?.piReachable = ok; self?.piLatency = ms; self?.piError = err; group.leave() - } group.enter(); tcpPing(host: cfg.localHost, port: UInt16(cfg.localPort)) { [weak self] ok, ms, err in self?.localReachable = ok; self?.localLatency = ms; self?.localError = err; group.leave() } @@ -138,7 +136,6 @@ final class ServiceChecker { } func tooltipForAggregateK3s() -> String { let rHost = Config.shared.retropieHost - let pHost = Config.shared.piHost var r = raspberryReachable ? "\(rHost) ✓ (\(raspberryLatency) ms)" : "\(rHost) ✗" var p = piReachable ? "\(pHost) ✓ (\(piLatency) ms)" : "\(pHost) ✗" if !raspberryReachable, let e = raspberryError { r += " — \(e)" } diff --git a/prole-app/Sources/StatusView.swift b/prole-app/Sources/StatusView.swift index 95fb7ed..6093faa 100644 --- a/prole-app/Sources/StatusView.swift +++ b/prole-app/Sources/StatusView.swift @@ -140,7 +140,7 @@ final class StatusView: NSView { guard let c = checker else { return "No status" } let cfg = Config.shared let svc = c.svcReachable ? "\(cfg.svcHost):\(cfg.svcPort) ✓" : "\(cfg.svcHost):\(cfg.svcPort) ✗" - let agg = "k3s: \(cfg.retropieHost) \(c.raspberryReachable ? "✓" : "✗"), \(cfg.piHost) \(c.piReachable ? "✓" : "✗")" + let agg = "k3s: \(cfg.retropieHost) \(c.raspberryReachable ? "✓" : "✗") " let loc = c.localReachable ? "k3d \(cfg.localHost):\(cfg.localPort) ✓" : "k3d \(cfg.localHost):\(cfg.localPort) ✗" return [svc, agg, loc].joined(separator: " • ") } diff --git a/prole-app/prole.properties b/prole-app/prole.properties index d6a3317..0161d06 100644 --- a/prole-app/prole.properties +++ b/prole-app/prole.properties @@ -29,8 +29,6 @@ svc.port=443 # k3s aggregate ? replace legacy raspberry with retropie k3s.retropie.host=retropie.prole.org k3s.retropie.port=6443 -# k3s.pi.host=pi.prole.org -# k3s.pi.port=6443 # local k3d k3d.local.host=localhost