liuwei_x_x/abot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(schedule): 任务页上次执行时间改为日志兜底

Browse Source 
- 新增批量查询接口 get_latest_logs_map，从 t_plugin_schedule_logs 获取各任务最新执行记录

- 插件任务列表拼装时优先用运行时数据，缺失则回填数据库最新日志

- 修复重启后任务页 last_run_at/last_status 显示为空的问题
This commit is contained in:
liuwei
2026-04-22 09:49:15 +08:00
parent 963d44d82a
commit fc8af8ff75
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/plugin_schedule_manager.py
View File

@@ -294,19 +294,27 @@ class PluginScheduleManager:
db_rows = self.db.list_schedules()
runtime_rows = async_job.get_jobs_snapshot()
runtime_by_key = {row.get("job_key"): row for row in runtime_rows if row.get("job_key")}
# 日志兜底：进程重启后内存态 last_run_at 会丢失，任务页需要从数据库最新日志恢复显示。
schedule_ids = [int(row.get("id")) for row in db_rows if row.get("id") is not None]
latest_log_by_schedule = self.db.get_latest_logs_map(schedule_ids)
data = []
for row in db_rows:
key = f"plugin_schedule:{row['id']}"
schedule_id = int(row["id"])
key = f"plugin_schedule:{schedule_id}"
runtime = runtime_by_key.get(key, {})
latest_log = latest_log_by_schedule.get(schedule_id) or {}
merged = dict(row)
merged["runtime_job_id"] = runtime.get("id")
merged["running"] = runtime.get("running", False)
merged["trigger_text"] = runtime.get("trigger_text", "")
merged["next_run_at"] = runtime.get("next_run_at")
merged["last_run_at"] = runtime.get("last_run_at")
merged["last_status"] = runtime.get("last_status")
merged["last_error"] = runtime.get("last_error")
# last_run_at 等字段优先取运行时；若缺失则用最新日志兜底，避免页面显示空白。
merged["last_run_at"] = runtime.get("last_run_at") or latest_log.get("triggered_at")
merged["last_status"] = runtime.get("last_status") or latest_log.get("status")
merged["last_error"] = runtime.get("last_error") or ""
if not merged["last_error"] and str(merged["last_status"]) == "failed":
merged["last_error"] = str(latest_log.get("summary") or "")
merged["last_duration_ms"] = runtime.get("last_duration_ms")
merged["run_count"] = runtime.get("run_count", 0)
merged["success_count"] = runtime.get("success_count", 0)