1a1306ec71
- 新增系统任务日志表 t_system_job_logs，持久化记录每次执行结果、摘要、耗时、详情JSON\n- SystemJobLoader 注册任务时增加执行包装器：成功/失败均写入数据库日志，失败后继续抛出保证运行态状态一致\n- 系统任务后台日志接口改为查询数据库日志（不再依赖仅内存的 async_job logs），解决重启后日志丢失问题\n- 保持前端日志字段兼容，接口返回映射为 time/level/message 结构
143 lines
5.5 KiB
Python
143 lines
5.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
from __future__ import annotations
|
|
|
|
import inspect
|
|
from datetime import datetime
|
|
from typing import Any, Awaitable, Callable, Dict, List
|
|
|
|
from loguru import logger
|
|
|
|
from db.system_job_db import SystemJobDBOperator
|
|
from utils.decorator.async_job import async_job
|
|
|
|
|
|
def get_system_job_definitions(robot) -> List[Dict[str, Any]]:
|
|
"""系统任务定义（业务函数映射）。
|
|
|
|
说明：这里只维护“任务 key 与业务函数”的绑定关系；
|
|
调度时间、启停状态全部从数据库 t_system_jobs 读取。
|
|
"""
|
|
return [
|
|
{
|
|
"job_key": "message_count_to_db",
|
|
"name": "消息计数入库",
|
|
"description": "每天 02:30 将 Redis 消息计数写入 SQLite",
|
|
"trigger_type": "at_times",
|
|
"trigger_config": {"time_list": ["02:30"]},
|
|
"handler": robot.message_count_to_db,
|
|
},
|
|
{
|
|
"job_key": "login_check",
|
|
"name": "登录状态巡检",
|
|
"description": "每天 14:43 执行登录二次校验",
|
|
"trigger_type": "at_times",
|
|
"trigger_config": {"time_list": ["14:43"]},
|
|
"handler": robot.login_twice_auto_auth,
|
|
},
|
|
{
|
|
"job_key": "process_pending_images",
|
|
"name": "待下载图片补偿处理",
|
|
"description": "每 5 分钟处理一次待下载图片/表情，避免数据库锁竞争",
|
|
"trigger_type": "every_seconds",
|
|
"trigger_config": {"seconds": 300},
|
|
"handler": _build_process_pending_images_handler(robot),
|
|
},
|
|
]
|
|
|
|
def _build_process_pending_images_handler(robot) -> Callable[[], Awaitable[None]]:
|
|
async def _handler():
|
|
if hasattr(robot, "message_storage") and robot.message_storage:
|
|
await robot.message_storage.process_pending_images(minutes_ago=10, batch_size=20)
|
|
|
|
return _handler
|
|
|
|
|
|
class SystemJobLoader:
|
|
"""系统任务加载器：从数据库读取调度配置并注册到 async_job。"""
|
|
|
|
def __init__(self, robot, system_job_db: SystemJobDBOperator):
|
|
self.robot = robot
|
|
self.db = system_job_db
|
|
self._job_defs = {item["job_key"]: item for item in get_system_job_definitions(robot)}
|
|
self._registered_job_ids: List[str] = []
|
|
|
|
def init_and_load(self):
|
|
self.db.init_tables()
|
|
self._seed_defaults()
|
|
self.reload_from_db()
|
|
|
|
def _seed_defaults(self):
|
|
for item in self._job_defs.values():
|
|
existed = self.db.get_job(item["job_key"])
|
|
if existed:
|
|
continue
|
|
self.db.upsert_job(
|
|
{
|
|
"job_key": item["job_key"],
|
|
"name": item["name"],
|
|
"description": item.get("description", ""),
|
|
"trigger_type": item["trigger_type"],
|
|
"trigger_config": item["trigger_config"],
|
|
"enabled": True,
|
|
}
|
|
)
|
|
|
|
def reload_from_db(self):
|
|
# 每次重载前先补齐默认任务，避免误删后无法恢复
|
|
self._seed_defaults()
|
|
|
|
# 先移除当前注册任务，避免重复调度
|
|
for job_id in self._registered_job_ids:
|
|
async_job.remove_job(job_id)
|
|
self._registered_job_ids = []
|
|
|
|
jobs = self.db.list_jobs()
|
|
for row in jobs:
|
|
job_key = row.get("job_key")
|
|
if not row.get("enabled", 1):
|
|
continue
|
|
definition = self._job_defs.get(job_key)
|
|
if not definition:
|
|
logger.warning(f"系统任务 {job_key} 在代码中无处理器，已跳过注册")
|
|
continue
|
|
|
|
raw_handler = definition["handler"]
|
|
|
|
async def _wrapped_handler(_handler=raw_handler, _job_key=job_key):
|
|
"""系统任务执行包装器：执行业务并持久化日志。"""
|
|
started_at = datetime.now()
|
|
try:
|
|
result = _handler()
|
|
# 兼容同步/异步 handler 两种写法。
|
|
if inspect.isawaitable(result):
|
|
await result
|
|
duration_ms = int((datetime.now() - started_at).total_seconds() * 1000)
|
|
self.db.create_job_log(
|
|
_job_key,
|
|
"success",
|
|
"执行成功",
|
|
detail={"job_key": _job_key},
|
|
duration_ms=duration_ms,
|
|
)
|
|
except Exception as e:
|
|
duration_ms = int((datetime.now() - started_at).total_seconds() * 1000)
|
|
# 失败日志写库后继续抛出，让 async_job 运行态状态也能正确标记为 failed。
|
|
self.db.create_job_log(
|
|
_job_key,
|
|
"failed",
|
|
f"执行失败: {e}",
|
|
detail={"job_key": _job_key, "error": str(e)},
|
|
duration_ms=duration_ms,
|
|
)
|
|
raise
|
|
|
|
job_id = async_job.register_callable(
|
|
func=_wrapped_handler,
|
|
trigger_type=row.get("trigger_type", definition["trigger_type"]),
|
|
trigger_config=row.get("trigger_config", definition["trigger_config"]),
|
|
job_name=row.get("name") or definition["name"],
|
|
description=row.get("description") or definition.get("description", ""),
|
|
job_key=job_key,
|
|
)
|
|
self._registered_job_ids.append(job_id)
|