benya/tg-admin-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep backup/queue SLA and OpenWrt leases diff in their menus

Browse Source
This commit is contained in:
Alex
2026-02-09 04:10:04 +03:00
parent 02b8e2bb55
commit 2b87ce04a3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
handlers/system.py
View File

@@ -557,15 +557,15 @@ async def backup_sla(msg: Message):
return return
rc, out = await run_cmd_full(["restic", "snapshots", "--json"], use_restic_env=True, timeout=40) rc, out = await run_cmd_full(["restic", "snapshots", "--json"], use_restic_env=True, timeout=40)
if rc != 0: if rc != 0:
await msg.answer(f"⚠️ Restic error: {out.strip() or rc}", reply_markup=system_logs_audit_kb) await msg.answer(f"⚠️ Restic error: {out.strip() or rc}", reply_markup=backup_kb)
return return
try: try:
snaps = json.loads(out) snaps = json.loads(out)
except Exception as e: except Exception as e:
await msg.answer(f"⚠️ Invalid restic JSON: {e}", reply_markup=system_logs_audit_kb) await msg.answer(f"⚠️ Invalid restic JSON: {e}", reply_markup=backup_kb)
return return
if not isinstance(snaps, list) or not snaps: if not isinstance(snaps, list) or not snaps:
await msg.answer("⚠️ No snapshots found", reply_markup=system_logs_audit_kb) await msg.answer("⚠️ No snapshots found", reply_markup=backup_kb)
return return
snaps.sort(key=lambda s: s.get("time", ""), reverse=True) snaps.sort(key=lambda s: s.get("time", ""), reverse=True)
last_time_raw = snaps[0].get("time") last_time_raw = snaps[0].get("time")
@@ -591,7 +591,7 @@ async def backup_sla(msg: Message):
f"Snapshots: {len(snaps)}\n" f"Snapshots: {len(snaps)}\n"
f"Last: {last_str} (age {age_str})\n" f"Last: {last_str} (age {age_str})\n"
f"SLA: {sla}h", f"SLA: {sla}h",
reply_markup=system_logs_audit_kb, reply_markup=backup_kb,
) )
@@ -645,7 +645,7 @@ async def openwrt_leases_diff(msg: Message):
prev = runtime_state.get("openwrt_leases_prev", []) prev = runtime_state.get("openwrt_leases_prev", [])
if not prev: if not prev:
runtime_state.set_state("openwrt_leases_prev", leases_now) runtime_state.set_state("openwrt_leases_prev", leases_now)
await msg.answer(f"Baseline saved ({len(leases_now)} leases)", reply_markup=system_info_kb) await msg.answer(f"Baseline saved ({len(leases_now)} leases)", reply_markup=openwrt_kb)
return return
prev_set = set(prev) prev_set = set(prev)
now_set = set(leases_now) now_set = set(leases_now)
@@ -672,7 +672,7 @@ async def queue_sla(msg: Message):
return return
hist = get_history_raw() hist = get_history_raw()
if not hist: if not hist:
await msg.answer("🧾 Queue SLA: history is empty", reply_markup=system_logs_audit_kb) await msg.answer("🧾 Queue SLA: history is empty", reply_markup=backup_kb)
return return
waits = [item.get("wait_sec", 0) for item in hist] waits = [item.get("wait_sec", 0) for item in hist]
runs = [item.get("runtime_sec", 0) for item in hist] runs = [item.get("runtime_sec", 0) for item in hist]
@@ -696,7 +696,7 @@ async def queue_sla(msg: Message):
f"Avg wait: {stats.get('avg_wait_sec', 0):.1f}s, " f"Avg wait: {stats.get('avg_wait_sec', 0):.1f}s, "
f"avg run: {stats.get('avg_runtime_sec', 0):.1f}s" f"avg run: {stats.get('avg_runtime_sec', 0):.1f}s"
) )
await msg.answer("\n".join(lines), reply_markup=system_logs_audit_kb) await msg.answer("\n".join(lines), reply_markup=backup_kb)
@dp.message(F.text == "/selftest_history") @dp.message(F.text == "/selftest_history")