터치 패널 체크 열 온도 카드만 유지
This commit is contained in:
1 parent
1011079cdb
commit
e82602a22d
2 files changed
+25
-99
No files matched your search
+24
-98
@@ -90,23 +90,11 @@ awk -F= '
|
||||
$1 == "sata4" {printf "SATA4_TEMP=%s\n", $2 ? $2 : "-"}
|
||||
'
|
||||
"""
|
||||
SYNOLOGY_SERVICE_SCRIPT = r"""
|
||||
ps -ef | grep 'nginx: master' | grep -v grep >/dev/null && echo WEB=1 || echo WEB=0
|
||||
ps -ef | grep -E 'mariadbd|mysqld' | grep -v grep >/dev/null && echo DB=1 || echo DB=0
|
||||
ps -ef | grep -E '[/ ]gitea( |$)|gitea web' | grep -v grep >/dev/null && echo GITEA=1 || echo GITEA=0
|
||||
"""
|
||||
LOCAL_LOG_SCRIPT = r"""
|
||||
active="$(/usr/bin/systemctl is-active rsyslog 2>/dev/null || echo unknown)"
|
||||
queue="$(find /var/spool/rsyslog -name 'control_synology_fwd*' -type f 2>/dev/null | wc -l)"
|
||||
echo "RSYSLOG=$active"
|
||||
echo "QUEUE=$queue"
|
||||
"""
|
||||
SAMPLE_INTERVAL_MS = 50
|
||||
GRAPH_SECONDS = 30
|
||||
GRAPH_POINTS = GRAPH_SECONDS * 1000 // SAMPLE_INTERVAL_MS
|
||||
SYNOLOGY_RESTART_INTERVAL_MS = 1000
|
||||
SYNOLOGY_DISK_TEMP_INTERVAL_MS = 10000
|
||||
SLOW_STATUS_INTERVAL_MS = 5000
|
||||
|
||||
|
||||
def byte_rate_unit(values):
|
||||
@@ -581,7 +569,6 @@ class TouchPanel(QMainWindow):
|
||||
self.synology_buffer = ""
|
||||
self.synology_values = {}
|
||||
self.synology_disk_temps = {}
|
||||
self.synology_services = {}
|
||||
self.last_io = None
|
||||
self.last_sample = None
|
||||
self.last_graph = None
|
||||
@@ -634,18 +621,6 @@ class TouchPanel(QMainWindow):
|
||||
self.synology_disk_temp_timer.timeout.connect(self.update_synology_disk_temp)
|
||||
self.synology_disk_temp_timer.start(SYNOLOGY_DISK_TEMP_INTERVAL_MS)
|
||||
|
||||
self.synology_service_proc = QProcess(self)
|
||||
self.synology_service_proc.finished.connect(self.synology_service_finished)
|
||||
self.synology_service_timer = QTimer(self)
|
||||
self.synology_service_timer.timeout.connect(self.update_synology_services)
|
||||
self.synology_service_timer.start(SLOW_STATUS_INTERVAL_MS)
|
||||
|
||||
self.local_log_proc = QProcess(self)
|
||||
self.local_log_proc.finished.connect(self.local_log_finished)
|
||||
self.local_log_timer = QTimer(self)
|
||||
self.local_log_timer.timeout.connect(self.update_local_log_status)
|
||||
self.local_log_timer.start(SLOW_STATUS_INTERVAL_MS)
|
||||
|
||||
self.pulse_timer = QTimer(self)
|
||||
self.pulse_timer.timeout.connect(self.tick_pulses)
|
||||
self.pulse_timer.start(25)
|
||||
@@ -654,8 +629,6 @@ class TouchPanel(QMainWindow):
|
||||
self.update_disk_temp()
|
||||
self.update_synology_status()
|
||||
self.update_synology_disk_temp()
|
||||
self.update_synology_services()
|
||||
self.update_local_log_status()
|
||||
self.update_dashboard()
|
||||
|
||||
def _build_ui(self):
|
||||
@@ -689,12 +662,12 @@ class TouchPanel(QMainWindow):
|
||||
status_grid.addWidget(extra_title, 0, 2)
|
||||
|
||||
status_rows = [
|
||||
(("io", "DISK I/O"), ("synology_sata1", "SATA1"), ("warn_temp", "TEMP")),
|
||||
(("local", "LOCAL"), ("synology_sata2", "SATA2"), ("svc_web", "WEB")),
|
||||
(("wan", "UPLINK"), ("synology_sata4", "SATA4"), ("svc_db", "DB")),
|
||||
(("lan", "ETH1"), ("synology_local", "LOCAL"), ("svc_gitea", "GITEA")),
|
||||
(("wifi5", "5G"), ("synology_wan", "UPLINK"), ("syslog_link", "SYSLOG")),
|
||||
(("wifi24", "2.4G"), None, ("pc_net", "PC NET")),
|
||||
(("io", "DISK I/O"), ("synology_sata1", "SATA1"), ("rpi_temp", "RPI TEMP")),
|
||||
(("local", "LOCAL"), ("synology_sata2", "SATA2"), ("synology_temp", "SYNO TEMP")),
|
||||
(("wan", "UPLINK"), ("synology_sata4", "SATA4"), None),
|
||||
(("lan", "ETH1"), ("synology_local", "LOCAL"), None),
|
||||
(("wifi5", "5G"), ("synology_wan", "UPLINK"), None),
|
||||
(("wifi24", "2.4G"), None, None),
|
||||
]
|
||||
for index, (pi_row, synology_row, extra_row) in enumerate(status_rows, 1):
|
||||
key, label = pi_row
|
||||
@@ -827,13 +800,7 @@ class TouchPanel(QMainWindow):
|
||||
self.rows["lan"].set_state(self.iface_detail(groups["lan"], "eth1"), activity["lan"]["error"], activity["lan"]["read"], activity["lan"]["write"])
|
||||
self.rows["wifi24"].set_state(self.iface_detail(groups["wifi24"], "wlan0"), activity["wifi24"]["error"], activity["wifi24"]["read"], activity["wifi24"]["write"])
|
||||
self.rows["wifi5"].set_state(self.iface_detail(groups["wifi5"], "wlan1"), activity["wifi5"]["error"], activity["wifi5"]["read"], activity["wifi5"]["write"])
|
||||
self.render_temp_warning(temp)
|
||||
self.rows["pc_net"].set_state(
|
||||
"eth1" if self.pc_button.online else "꺼짐",
|
||||
read_activity=self.pc_button.online and activity["lan"]["read"],
|
||||
write_activity=self.pc_button.online and activity["lan"]["write"],
|
||||
error_steady=False,
|
||||
)
|
||||
self.render_rpi_temp(temp)
|
||||
|
||||
self.latest_temp = temp
|
||||
self.latest_rpm = rpm
|
||||
@@ -883,6 +850,7 @@ class TouchPanel(QMainWindow):
|
||||
for part in parts:
|
||||
if part.isdigit():
|
||||
self.disk_temp = float(part)
|
||||
self.render_rpi_temp(getattr(self, "latest_temp", cpu_temp()))
|
||||
return
|
||||
|
||||
def update_synology_status(self):
|
||||
@@ -897,16 +865,6 @@ class TouchPanel(QMainWindow):
|
||||
return
|
||||
self.synology_disk_temp_proc.start(SYNOLOGY_SSH[0], SYNOLOGY_SSH[1:] + [SYNOLOGY_DISK_TEMP_SCRIPT])
|
||||
|
||||
def update_synology_services(self):
|
||||
if self.synology_service_proc.state() != QProcess.NotRunning:
|
||||
return
|
||||
self.synology_service_proc.start(SYNOLOGY_SSH[0], SYNOLOGY_SSH[1:] + [SYNOLOGY_SERVICE_SCRIPT])
|
||||
|
||||
def update_local_log_status(self):
|
||||
if self.local_log_proc.state() != QProcess.NotRunning:
|
||||
return
|
||||
self.local_log_proc.start("/bin/sh", ["-c", LOCAL_LOG_SCRIPT])
|
||||
|
||||
def synology_disk_temp_finished(self, exit_code, exit_status):
|
||||
del exit_status
|
||||
if exit_code != 0:
|
||||
@@ -919,30 +877,7 @@ class TouchPanel(QMainWindow):
|
||||
key, value = line.split("=", 1)
|
||||
temps[key.strip()] = value.strip()
|
||||
self.synology_disk_temps = temps
|
||||
self.render_temp_warning(getattr(self, "latest_temp", cpu_temp()))
|
||||
|
||||
def synology_service_finished(self, exit_code, exit_status):
|
||||
del exit_status
|
||||
output = bytes(self.synology_service_proc.readAllStandardOutput()).decode("utf-8", "ignore")
|
||||
values = self.parse_status_output(output) if exit_code == 0 else {}
|
||||
self.synology_services = values
|
||||
self.render_service_tile("svc_web", "nginx", values.get("WEB") == "1", bool(values))
|
||||
self.render_service_tile("svc_db", "MariaDB", values.get("DB") == "1", bool(values))
|
||||
self.render_service_tile("svc_gitea", "Gitea", values.get("GITEA") == "1", bool(values))
|
||||
|
||||
def local_log_finished(self, exit_code, exit_status):
|
||||
del exit_status
|
||||
output = bytes(self.local_log_proc.readAllStandardOutput()).decode("utf-8", "ignore")
|
||||
values = self.parse_status_output(output) if exit_code == 0 else {}
|
||||
rsyslog_ok = values.get("RSYSLOG") == "active"
|
||||
queue_count = int(values.get("QUEUE", "0") or 0)
|
||||
detail = f"Q {queue_count}" if rsyslog_ok else values.get("RSYSLOG", "down")
|
||||
self.rows["syslog_link"].set_state(
|
||||
detail,
|
||||
read_steady=rsyslog_ok and queue_count == 0,
|
||||
write_steady=rsyslog_ok and queue_count > 0,
|
||||
error_steady=not rsyslog_ok,
|
||||
)
|
||||
self.render_synology_temp()
|
||||
|
||||
def synology_status_ready(self):
|
||||
output = bytes(self.synology_proc.readAllStandardOutput()).decode("utf-8", "ignore")
|
||||
@@ -1001,28 +936,29 @@ class TouchPanel(QMainWindow):
|
||||
write_activity = previous is not None and writes > previous[1]
|
||||
self.rows[key].set_state(detail, read_activity=read_activity, write_activity=write_activity, error_steady=False)
|
||||
|
||||
def render_temp_warning(self, pi_temp):
|
||||
synology_temps = []
|
||||
for value in self.synology_disk_temps.values():
|
||||
if value.isdigit():
|
||||
synology_temps.append(float(value))
|
||||
synology_max = max(synology_temps) if synology_temps else 0.0
|
||||
def render_rpi_temp(self, pi_temp):
|
||||
pi_disk = self.disk_temp or 0.0
|
||||
hottest = max(float(pi_temp), pi_disk, synology_max)
|
||||
hottest = max(float(pi_temp), pi_disk)
|
||||
detail = f"{hottest:.0f} C" if hottest > 0 else "- C"
|
||||
self.rows["warn_temp"].set_state(
|
||||
self.rows["rpi_temp"].set_state(
|
||||
detail,
|
||||
read_steady=0 < hottest < 60,
|
||||
write_steady=60 <= hottest < 70,
|
||||
error_steady=hottest >= 70,
|
||||
)
|
||||
|
||||
def render_service_tile(self, key, detail, ok, reachable):
|
||||
self.rows[key].set_state(
|
||||
detail if reachable else "끊김",
|
||||
read_steady=ok,
|
||||
write_steady=False,
|
||||
error_steady=not ok,
|
||||
def render_synology_temp(self):
|
||||
synology_temps = []
|
||||
for value in self.synology_disk_temps.values():
|
||||
if value.isdigit():
|
||||
synology_temps.append(float(value))
|
||||
synology_max = max(synology_temps) if synology_temps else 0.0
|
||||
detail = f"{synology_max:.0f} C" if synology_max > 0 else "- C"
|
||||
self.rows["synology_temp"].set_state(
|
||||
detail,
|
||||
read_steady=0 < synology_max < 60,
|
||||
write_steady=60 <= synology_max < 70,
|
||||
error_steady=synology_max >= 70,
|
||||
)
|
||||
|
||||
def synology_disk_temp_detail(self, disk):
|
||||
@@ -1031,16 +967,6 @@ class TouchPanel(QMainWindow):
|
||||
return "- C"
|
||||
return f"{value} C"
|
||||
|
||||
@staticmethod
|
||||
def parse_status_output(output):
|
||||
values = {}
|
||||
for line in output.splitlines():
|
||||
if "=" not in line:
|
||||
continue
|
||||
key, value = line.split("=", 1)
|
||||
values[key.strip()] = value.strip()
|
||||
return values
|
||||
|
||||
def set_synology_net_tile(self, key, rx, tx, errors, drops, detail):
|
||||
previous = self.last_synology.get(key)
|
||||
self.last_synology[key] = (rx, tx, errors, drops)
|
||||
|
||||
Reference in new issue
Block a user