复核 DSH 合入代码并修复早期任务错误漏报

Browse Source
This commit is contained in:
yws
2026-10-22 01:17:52 +00:00
parent 625fdcd250
commit e1ebb09648
4 changed files with 81 additions and 6 deletions
+15 -5
View File
@@ -9,6 +9,7 @@ import subprocess
import sys import sys
import threading import threading
import time import time
from collections import deque
from .aalc_task import RESTORE_ENV from .aalc_task import RESTORE_ENV
@@ -41,15 +42,21 @@ ERROR_SCAN_LINES = 400
def log_errors(path, limit=3): def log_errors(path, limit=3):
"""挑出日志尾部的报错行。 """流式扫描整份任务日志, 只保留最后 limit 条报错。
AALC 的每日流程在单次战斗失败后会继续跑完并正常退出(exit 0), 只看退出码 AALC 的每日流程在单次战斗失败后会继续跑完并正常退出(exit 0), 只看退出码
会把"超出最大尝试次数,未能进入战斗"这类失败当成成功, 所以状态里额外附上 会把"超出最大尝试次数,未能进入战斗"这类失败当成成功, 所以状态里额外附上
日志里的报错行。 日志里的报错行。
""" """
hits = [line for line in tail(path, ERROR_SCAN_LINES) hits = deque(maxlen=limit)
if any(marker in line for marker in ERROR_MARKERS)] try:
return hits[-limit:] with open(path, encoding='utf-8', errors='replace') as f:
for line in f:
if any(marker in line for marker in ERROR_MARKERS):
hits.append(line.rstrip('\r\n'))
except OSError:
pass
return list(hits)
# AALC 卡死时不报错、进程健在, 只是反复输出同一类日志。 # AALC 卡死时不报错、进程健在, 只是反复输出同一类日志。
@@ -189,7 +196,10 @@ class TaskRunner:
r['stall'] = stalls r['stall'] = stalls
else: else:
r['exit_code'] = code r['exit_code'] = code
errors = log_errors(self.info['log']) # 子进程退出后日志已写完; 结果只计算一次, 避免轮询反复扫描大文件。
if 'errors' not in self.info:
self.info['errors'] = log_errors(self.info['log'])
errors = self.info['errors']
if errors: if errors:
r['errors'] = errors r['errors'] = errors
pending = self._pending_restores() pending = self._pending_restores()