chrisfu/prole
1
0
Fork 0
mirror of https://github.com/dredx/prole.git synced 2026-09-24 17:54:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed pi.prole.org from statusView -- very hardcoded still

Browse Source
This commit is contained in:
chrisfu 2025-12-06 00:33:49 -08:00
parent 0a98b668e0
commit 565d91571b
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prole-app/Sources/Config.swift
View File

@ -14,8 +14,6 @@ final class Config {
"svc.port": "443", "svc.port": "443",
"k3s.retropie.host": "retropie.prole.org", "k3s.retropie.host": "retropie.prole.org",
"k3s.retropie.port": "6443", "k3s.retropie.port": "6443",
"k3s.pi.host": "pi.prole.org",
"k3s.pi.port": "6443",
"k3d.local.host": "localhost", "k3d.local.host": "localhost",
"k3d.local.port": "6443" "k3d.local.port": "6443"
] ]
@ -63,9 +61,6 @@ final class Config {
var retropieHost: String { string("k3s.retropie.host", default: "retropie.prole.org") } var retropieHost: String { string("k3s.retropie.host", default: "retropie.prole.org") }
var retropiePort: Int { int("k3s.retropie.port", default: 6443) } 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 localHost: String { string("k3d.local.host", default: "localhost") }
var localPort: Int { int("k3d.local.port", default: 6443) } var localPort: Int { int("k3d.local.port", default: 6443) }

5
prole-app/Sources/ServiceChecker.swift
View File

@ -1,4 +1,5 @@
import Foundation import Foundation
import Network import Network
final class ServiceChecker { 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 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() 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 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() self?.localReachable = ok; self?.localLatency = ms; self?.localError = err; group.leave()
} }
@ -138,7 +136,6 @@ final class ServiceChecker {
} }
func tooltipForAggregateK3s() -> String { func tooltipForAggregateK3s() -> String {
let rHost = Config.shared.retropieHost let rHost = Config.shared.retropieHost
let pHost = Config.shared.piHost
var r = raspberryReachable ? "\(rHost) ✓ (\(raspberryLatency) ms)" : "\(rHost) ✗" var r = raspberryReachable ? "\(rHost) ✓ (\(raspberryLatency) ms)" : "\(rHost) ✗"
var p = piReachable ? "\(pHost) ✓ (\(piLatency) ms)" : "\(pHost) ✗" var p = piReachable ? "\(pHost) ✓ (\(piLatency) ms)" : "\(pHost) ✗"
if !raspberryReachable, let e = raspberryError { r += " — \(e)" } if !raspberryReachable, let e = raspberryError { r += " — \(e)" }

2
prole-app/Sources/StatusView.swift
View File

@ -140,7 +140,7 @@ final class StatusView: NSView {
guard let c = checker else { return "No status" } guard let c = checker else { return "No status" }
let cfg = Config.shared let cfg = Config.shared
let svc = c.svcReachable ? "\(cfg.svcHost):\(cfg.svcPort) ✓" : "\(cfg.svcHost):\(cfg.svcPort) ✗" 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) ✗" let loc = c.localReachable ? "k3d \(cfg.localHost):\(cfg.localPort) ✓" : "k3d \(cfg.localHost):\(cfg.localPort) ✗"
return [svc, agg, loc].joined(separator: " • ") return [svc, agg, loc].joined(separator: " • ")
} }

2
prole-app/prole.properties
View File

@ -29,8 +29,6 @@ svc.port=443
# k3s aggregate ? replace legacy raspberry with retropie # k3s aggregate ? replace legacy raspberry with retropie
k3s.retropie.host=retropie.prole.org k3s.retropie.host=retropie.prole.org
k3s.retropie.port=6443 k3s.retropie.port=6443
# k3s.pi.host=pi.prole.org
# k3s.pi.port=6443
# local k3d # local k3d
k3d.local.host=localhost k3d.local.host=localhost