审查修复: 任务配置恢复、执行器容错与续局状态、识别性能
正确性 - stop_task 强杀后 run_task 的临时次数会残留在 config.yaml (AALC 中途整份存盘); 任务启动时先落盘原值, 强停/异常退出后由 TaskRunner 用 --restore 写回, 写回失败时拒绝启动新任务并在 task_status 显示 pending_restore - Jev 执行器: 工具失败不再抛异常导致整局退出 (Session raise_on_error=False), 原有的"截图暂不可用"等降级分支终于生效; 刷新计数/开战标记只在动作成功后更新 - 一局完成后归档 jev_shop_context.json, 否则 claim_requested 让下一局一启动就判定完成 - 通用按钮直接点已核对的坐标, 不再 click_text 重新搜索 (可能点到背景同名按钮) - 认证行按字节比较, 非 ASCII 输入不再让 compare_digest 抛 TypeError - 单实例互斥改用 use_last_error 读取 ERROR_ALREADY_EXISTS 性能 - find_image 只在窗口尺寸变化时清模板缓存 (原来每次两次全量 gc); 模板列表只扫描一次 - 截图 PNG 压缩级别 1: 1080p 存图 0.66s -> 0.19s - 执行器每帧截图只解码一次 (button_enabled 75ms -> 0.3ms); 地图模板与 ORB 描述子按比例缓存 - 箭头模板用 imdecode 读取, 支持中文路径 (输出与 imread 逐像素一致) 测试 73 -> 84, 修改前的识别输出与修改后逐项比对一致。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+20
-10
@@ -57,6 +57,9 @@ def prune(directory, pattern, keep):
|
|||||||
|
|
||||||
class AalcEngine(Engine):
|
class AalcEngine(Engine):
|
||||||
|
|
||||||
|
_templates = None # 模板相对路径集合; assets 运行中不变, 只扫描一次磁盘
|
||||||
|
_template_size = None # 当前 AALC 模板缓存对应的缩放尺寸
|
||||||
|
|
||||||
def __init__(self, shot_dir, keep_shots=30):
|
def __init__(self, shot_dir, keep_shots=30):
|
||||||
self.shot_dir = os.path.abspath(shot_dir)
|
self.shot_dir = os.path.abspath(shot_dir)
|
||||||
os.makedirs(self.shot_dir, exist_ok=True)
|
os.makedirs(self.shot_dir, exist_ok=True)
|
||||||
@@ -90,7 +93,8 @@ class AalcEngine(Engine):
|
|||||||
def _save(self, img):
|
def _save(self, img):
|
||||||
stamp = time.strftime('%Y%m%d_%H%M%S') + '_%03d' % (int(time.time() * 1000) % 1000)
|
stamp = time.strftime('%Y%m%d_%H%M%S') + '_%03d' % (int(time.time() * 1000) % 1000)
|
||||||
path = os.path.join(self.shot_dir, 'shot_%s.png' % stamp)
|
path = os.path.join(self.shot_dir, 'shot_%s.png' % stamp)
|
||||||
img.save(path)
|
# 每次 get_state 都存图: 1080p 下默认压缩级别 6 约 0.66s, 级别 1 约 0.19s, 文件只大 ~17%
|
||||||
|
img.save(path, compress_level=1)
|
||||||
prune(self.shot_dir, 'shot_*.png', self.keep_shots)
|
prune(self.shot_dir, 'shot_*.png', self.keep_shots)
|
||||||
return {'path': path.replace('\\', '/'), 'w': img.width, 'h': img.height}
|
return {'path': path.replace('\\', '/'), 'w': img.width, 'h': img.height}
|
||||||
|
|
||||||
@@ -114,13 +118,15 @@ class AalcEngine(Engine):
|
|||||||
return shot, items
|
return shot, items
|
||||||
|
|
||||||
def list_images(self, prefix=''):
|
def list_images(self, prefix=''):
|
||||||
names = set()
|
if self._templates is None:
|
||||||
for theme in ('dark', 'default'):
|
names = set()
|
||||||
for lang in ('zh_cn', 'en', 'share'):
|
for theme in ('dark', 'default'):
|
||||||
base = os.path.join(self.images_root, theme, lang)
|
for lang in ('zh_cn', 'en', 'share'):
|
||||||
for p in glob.glob(os.path.join(base, '**', '*.png'), recursive=True):
|
base = os.path.join(self.images_root, theme, lang)
|
||||||
names.add(os.path.relpath(p, base).replace('\\', '/'))
|
for p in glob.glob(os.path.join(base, '**', '*.png'), recursive=True):
|
||||||
return sorted(n for n in names if n.startswith(prefix))
|
names.add(os.path.relpath(p, base).replace('\\', '/'))
|
||||||
|
self._templates = frozenset(names)
|
||||||
|
return sorted(n for n in self._templates if n.startswith(prefix))
|
||||||
|
|
||||||
def find_image(self, name, threshold=0.8, model='normal'):
|
def find_image(self, name, threshold=0.8, model='normal'):
|
||||||
if name not in self.list_images(name):
|
if name not in self.list_images(name):
|
||||||
@@ -132,16 +138,20 @@ class AalcEngine(Engine):
|
|||||||
# 保留亚像素比例:例如 1278 宽对应 718.875 高,取整会改变
|
# 保留亚像素比例:例如 1278 宽对应 718.875 高,取整会改变
|
||||||
# 缩放采样,使小图标的匹配置信度明显下降。
|
# 缩放采样,使小图标的匹配置信度明显下降。
|
||||||
match_size = max(1, min(img.height, img.width * 9 / 16))
|
match_size = max(1, min(img.height, img.width * 9 / 16))
|
||||||
|
# AALC 的模板缓存按加载时的 set_win_size 缩放, 键里不含尺寸; 尺寸变了才清空。
|
||||||
|
# 本进程只有这里用模板, 缓存可以一直保持当前客户区的比例
|
||||||
|
# (clear_img_cache 每次都会全量 gc, 不能每次调用都清)。
|
||||||
|
if match_size != self._template_size:
|
||||||
|
self.auto.clear_img_cache()
|
||||||
|
self._template_size = match_size
|
||||||
changed = match_size != old_size
|
changed = match_size != old_size
|
||||||
try:
|
try:
|
||||||
if changed:
|
if changed:
|
||||||
self.auto.clear_img_cache()
|
|
||||||
self.cfg.unsaved_set_value('set_win_size', match_size)
|
self.cfg.unsaved_set_value('set_win_size', match_size)
|
||||||
pos = self.auto.find_image_element(name, threshold, model=model)
|
pos = self.auto.find_image_element(name, threshold, model=model)
|
||||||
finally:
|
finally:
|
||||||
if changed:
|
if changed:
|
||||||
self.cfg.unsaved_set_value('set_win_size', old_size)
|
self.cfg.unsaved_set_value('set_win_size', old_size)
|
||||||
self.auto.clear_img_cache()
|
|
||||||
return (int(pos[0]), int(pos[1])) if pos else None
|
return (int(pos[0]), int(pos[1])) if pos else None
|
||||||
|
|
||||||
# ---- 动手 (AALC 输入后端,由 config.yaml 决定后台消息/前台输入) ----
|
# ---- 动手 (AALC 输入后端,由 config.yaml 决定后台消息/前台输入) ----
|
||||||
|
|||||||
+45
-10
@@ -2,9 +2,11 @@
|
|||||||
"""子进程入口: 跑 AALC 现成的任务流程。
|
"""子进程入口: 跑 AALC 现成的任务流程。
|
||||||
|
|
||||||
用法: python -m lc_mcp.aalc_task <task> [json_params]
|
用法: python -m lc_mcp.aalc_task <task> [json_params]
|
||||||
|
python -m lc_mcp.aalc_task --restore <file> 写回被强杀任务临时覆盖的配置
|
||||||
放在子进程里跑, 停止 = 杀进程树; 不会像 QThread.terminate 那样留下被占用的锁。
|
放在子进程里跑, 停止 = 杀进程树; 不会像 QThread.terminate 那样留下被占用的锁。
|
||||||
"""
|
"""
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from .aalc_engine import bootstrap
|
from .aalc_engine import bootstrap
|
||||||
@@ -17,6 +19,42 @@ TASKS = {
|
|||||||
'enkephalin': {'times': 'set_lunacy_to_enkephalin'},
|
'enkephalin': {'times': 'set_lunacy_to_enkephalin'},
|
||||||
'mirror': {'count': 'set_mirror_count'},
|
'mirror': {'count': 'set_mirror_count'},
|
||||||
}
|
}
|
||||||
|
RESTORE_ENV = 'LCP_RESTORE_FILE'
|
||||||
|
|
||||||
|
|
||||||
|
def apply_overrides(cfg, task, params, restore_path=None):
|
||||||
|
"""临时覆盖本次运行的次数, 返回原值。
|
||||||
|
|
||||||
|
AALC 运行中会整份保存配置(如镜牢后 rotate_team_queue), 覆盖值会被写进 config.yaml。
|
||||||
|
所以先把原值落盘: 进程被 stop_task 强杀、finally 来不及执行时, TaskRunner 据此写回。
|
||||||
|
"""
|
||||||
|
originals = {TASKS[task][name]: cfg.get_value(TASKS[task][name]) for name in params}
|
||||||
|
if originals and restore_path:
|
||||||
|
tmp = restore_path + '.tmp'
|
||||||
|
with open(tmp, 'w', encoding='utf-8') as f:
|
||||||
|
json.dump(originals, f, ensure_ascii=False)
|
||||||
|
os.replace(tmp, restore_path)
|
||||||
|
for name, value in params.items():
|
||||||
|
cfg.unsaved_set_value(TASKS[task][name], int(value))
|
||||||
|
return originals
|
||||||
|
|
||||||
|
|
||||||
|
def restore(cfg, originals, restore_path=None):
|
||||||
|
for key, value in originals.items():
|
||||||
|
cfg.set_value(key, value)
|
||||||
|
if originals:
|
||||||
|
cfg.flush()
|
||||||
|
if restore_path and os.path.exists(restore_path):
|
||||||
|
os.remove(restore_path)
|
||||||
|
|
||||||
|
|
||||||
|
def restore_file(path, cfg=None):
|
||||||
|
with open(path, encoding='utf-8') as f:
|
||||||
|
originals = json.load(f)
|
||||||
|
if cfg is None:
|
||||||
|
bootstrap()
|
||||||
|
from module.config import cfg
|
||||||
|
restore(cfg, originals, path)
|
||||||
|
|
||||||
|
|
||||||
def run(task, params):
|
def run(task, params):
|
||||||
@@ -28,11 +66,8 @@ def run(task, params):
|
|||||||
from tasks.battle import battle
|
from tasks.battle import battle
|
||||||
from utils.path_manager import path_manager
|
from utils.path_manager import path_manager
|
||||||
|
|
||||||
originals = {}
|
restore_path = os.environ.get(RESTORE_ENV)
|
||||||
for name, value in params.items():
|
originals = apply_overrides(cfg, task, params, restore_path)
|
||||||
key = TASKS[task][name]
|
|
||||||
originals[key] = cfg.get_value(key)
|
|
||||||
cfg.unsaved_set_value(key, int(value))
|
|
||||||
try:
|
try:
|
||||||
if task == 'all':
|
if task == 'all':
|
||||||
scheme.script_task()
|
scheme.script_task()
|
||||||
@@ -54,14 +89,14 @@ def run(task, params):
|
|||||||
}[task]()
|
}[task]()
|
||||||
finally:
|
finally:
|
||||||
retry_monitor.stop()
|
retry_monitor.stop()
|
||||||
# AALC 运行中会自行保存配置(换队伍队列等), 把临时覆盖的次数写回原值
|
restore(cfg, originals, restore_path)
|
||||||
for key, value in originals.items():
|
|
||||||
cfg.set_value(key, value)
|
|
||||||
if originals:
|
|
||||||
cfg.flush()
|
|
||||||
|
|
||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
|
if len(argv) == 3 and argv[1] == '--restore':
|
||||||
|
restore_file(argv[2])
|
||||||
|
print('[lc_mcp] restored config from %s' % argv[2], flush=True)
|
||||||
|
return 0
|
||||||
if len(argv) < 2 or argv[1] not in TASKS:
|
if len(argv) < 2 or argv[1] not in TASKS:
|
||||||
print('usage: python -m lc_mcp.aalc_task <%s> [json]' % '|'.join(TASKS), file=sys.stderr)
|
print('usage: python -m lc_mcp.aalc_task <%s> [json]' % '|'.join(TASKS), file=sys.stderr)
|
||||||
return 2
|
return 2
|
||||||
|
|||||||
+3
-2
@@ -95,8 +95,9 @@ class _Handler(socketserver.StreamRequestHandler):
|
|||||||
|
|
||||||
def _handle_session(self):
|
def _handle_session(self):
|
||||||
rfile, wfile = self.rfile, self.wfile
|
rfile, wfile = self.rfile, self.wfile
|
||||||
first = rfile.readline(256).decode('utf-8', 'replace').strip()
|
# 按字节比较: compare_digest 对含非 ASCII 字符的 str 会抛 TypeError
|
||||||
if not (first.startswith('AUTH ') and hmac.compare_digest(first[5:], self.server.token)):
|
first = rfile.readline(256).strip()
|
||||||
|
if not (first.startswith(b'AUTH ') and hmac.compare_digest(first[5:], self.server.token.encode('ascii'))):
|
||||||
wfile.write(b'DENIED\n')
|
wfile.write(b'DENIED\n')
|
||||||
log('rejected connection from %s' % (self.client_address,))
|
log('rejected connection from %s' % (self.client_address,))
|
||||||
return
|
return
|
||||||
|
|||||||
+81
-36
@@ -9,14 +9,21 @@ import sys
|
|||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
from .aalc_task import RESTORE_ENV
|
||||||
|
|
||||||
REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
IS_WIN = sys.platform.startswith('win')
|
IS_WIN = sys.platform.startswith('win')
|
||||||
|
RESTORE_SUFFIX = '.restore.json'
|
||||||
|
|
||||||
|
|
||||||
def default_argv(task, params):
|
def default_argv(task, params):
|
||||||
return [sys.executable, '-m', 'lc_mcp.aalc_task', task, json.dumps(params)]
|
return [sys.executable, '-m', 'lc_mcp.aalc_task', task, json.dumps(params)]
|
||||||
|
|
||||||
|
|
||||||
|
def default_restore_argv(path):
|
||||||
|
return [sys.executable, '-m', 'lc_mcp.aalc_task', '--restore', path]
|
||||||
|
|
||||||
|
|
||||||
def tail(path, n):
|
def tail(path, n):
|
||||||
try:
|
try:
|
||||||
with open(path, 'rb') as f:
|
with open(path, 'rb') as f:
|
||||||
@@ -30,10 +37,11 @@ def tail(path, n):
|
|||||||
|
|
||||||
class TaskRunner:
|
class TaskRunner:
|
||||||
|
|
||||||
def __init__(self, run_dir, argv_factory=default_argv, keep_logs=20):
|
def __init__(self, run_dir, argv_factory=default_argv, keep_logs=20, restore_argv=default_restore_argv):
|
||||||
self.run_dir = os.path.abspath(run_dir)
|
self.run_dir = os.path.abspath(run_dir)
|
||||||
os.makedirs(self.run_dir, exist_ok=True)
|
os.makedirs(self.run_dir, exist_ok=True)
|
||||||
self.argv_factory = argv_factory
|
self.argv_factory = argv_factory
|
||||||
|
self.restore_argv = restore_argv
|
||||||
self.keep_logs = keep_logs
|
self.keep_logs = keep_logs
|
||||||
self._lock = threading.Lock()
|
self._lock = threading.Lock()
|
||||||
self.proc = None
|
self.proc = None
|
||||||
@@ -42,61 +50,98 @@ class TaskRunner:
|
|||||||
def running(self):
|
def running(self):
|
||||||
return self.proc is not None and self.proc.poll() is None
|
return self.proc is not None and self.proc.poll() is None
|
||||||
|
|
||||||
|
def _env(self):
|
||||||
|
return dict(os.environ, PYTHONPATH=REPO + os.pathsep + os.environ.get('PYTHONPATH', ''),
|
||||||
|
PYTHONIOENCODING='utf-8', PYTHONUNBUFFERED='1')
|
||||||
|
|
||||||
|
def _pending_restores(self):
|
||||||
|
"""被强杀/崩溃的任务留下的原值文件(不含正在运行的任务自己的)。新的在前:
|
||||||
|
有多份时最后写回的是最早一份, 也就是真正的原值。"""
|
||||||
|
current = self.info.get('restore') if self.info and self.running() else None
|
||||||
|
return [p for p in sorted(glob.glob(os.path.join(self.run_dir, '*' + RESTORE_SUFFIX)), reverse=True)
|
||||||
|
if p != current]
|
||||||
|
|
||||||
|
def _restore_leftovers(self):
|
||||||
|
"""把遗留的原值写回 config.yaml。成功返回 None, 否则返回原因。"""
|
||||||
|
for path in self._pending_restores():
|
||||||
|
name = os.path.basename(path)
|
||||||
|
try:
|
||||||
|
r = subprocess.run(self.restore_argv(path), cwd=REPO, env=self._env(),
|
||||||
|
stdin=subprocess.DEVNULL, capture_output=True, timeout=120)
|
||||||
|
except (OSError, subprocess.TimeoutExpired) as e:
|
||||||
|
return 'config restore from %s failed: %s' % (name, e)
|
||||||
|
if r.returncode != 0 or os.path.exists(path):
|
||||||
|
out = (r.stdout + r.stderr).decode('utf-8', 'replace').strip().splitlines()[-3:]
|
||||||
|
return 'config restore from %s failed (exit %s): %s' % (name, r.returncode, ' | '.join(out))
|
||||||
|
return None
|
||||||
|
|
||||||
def start(self, task, params):
|
def start(self, task, params):
|
||||||
with self._lock:
|
with self._lock:
|
||||||
if self.running():
|
if self.running():
|
||||||
return {'ok': False, 'error': '已有任务在跑: %s (先 stop_task)' % self.info['task']}
|
return {'ok': False, 'error': '已有任务在跑: %s (先 stop_task)' % self.info['task']}
|
||||||
|
err = self._restore_leftovers()
|
||||||
|
if err:
|
||||||
|
# 否则新任务会把残留的覆盖值当成原值记下, 真正的原值就丢了
|
||||||
|
return {'ok': False, 'error': err + '; 写回 config.yaml 之前不启动新任务'}
|
||||||
stamp = time.strftime('%Y%m%d_%H%M%S')
|
stamp = time.strftime('%Y%m%d_%H%M%S')
|
||||||
log_path = os.path.join(self.run_dir, 'task_%s_%s.log' % (stamp, task))
|
base = os.path.join(self.run_dir, 'task_%s_%s' % (stamp, task))
|
||||||
env = dict(os.environ, PYTHONPATH=REPO + os.pathsep + os.environ.get('PYTHONPATH', ''),
|
env = self._env()
|
||||||
PYTHONIOENCODING='utf-8', PYTHONUNBUFFERED='1')
|
env[RESTORE_ENV] = base + RESTORE_SUFFIX
|
||||||
kw = {'creationflags': subprocess.CREATE_NEW_PROCESS_GROUP} if IS_WIN else {'start_new_session': True}
|
kw = {'creationflags': subprocess.CREATE_NEW_PROCESS_GROUP} if IS_WIN else {'start_new_session': True}
|
||||||
with open(log_path, 'wb') as logf:
|
with open(base + '.log', 'wb') as logf:
|
||||||
self.proc = subprocess.Popen(self.argv_factory(task, params), cwd=REPO, env=env,
|
self.proc = subprocess.Popen(self.argv_factory(task, params), cwd=REPO, env=env,
|
||||||
stdin=subprocess.DEVNULL, stdout=logf, stderr=subprocess.STDOUT, **kw)
|
stdin=subprocess.DEVNULL, stdout=logf, stderr=subprocess.STDOUT, **kw)
|
||||||
self.info = {'task': task, 'params': params, 'log': log_path.replace('\\', '/'),
|
self.info = {'task': task, 'params': params, 'log': (base + '.log').replace('\\', '/'),
|
||||||
'started': time.time(), 'stopped_by_user': False}
|
'restore': env[RESTORE_ENV], 'started': time.time(), 'stopped_by_user': False}
|
||||||
self._prune()
|
self._prune()
|
||||||
return {'ok': True, 'task': task, 'pid': self.proc.pid, 'log': self.info['log']}
|
return {'ok': True, 'task': task, 'pid': self.proc.pid, 'log': self.info['log']}
|
||||||
|
|
||||||
def status(self, lines=30):
|
def status(self, lines=30):
|
||||||
with self._lock:
|
with self._lock:
|
||||||
if self.info is None:
|
if self.info is None:
|
||||||
return {'ok': True, 'state': 'idle'}
|
r = {'ok': True, 'state': 'idle'}
|
||||||
code = self.proc.poll()
|
|
||||||
if code is None:
|
|
||||||
state = 'running'
|
|
||||||
elif self.info['stopped_by_user']:
|
|
||||||
state = 'stopped'
|
|
||||||
else:
|
else:
|
||||||
state = 'succeeded' if code == 0 else 'failed'
|
code = self.proc.poll()
|
||||||
r = {'ok': True, 'state': state, 'task': self.info['task'], 'params': self.info['params'],
|
if code is None:
|
||||||
'elapsed_s': int((self.info.get('ended') or time.time()) - self.info['started']),
|
state = 'running'
|
||||||
'log': self.info['log'], 'log_tail': tail(self.info['log'], max(1, min(int(lines), 200)))}
|
else:
|
||||||
if code is not None:
|
self.info.setdefault('ended', time.time())
|
||||||
r['exit_code'] = code
|
state = 'stopped' if self.info['stopped_by_user'] else 'succeeded' if code == 0 else 'failed'
|
||||||
self.info.setdefault('ended', time.time())
|
r = {'ok': True, 'state': state, 'task': self.info['task'], 'params': self.info['params'],
|
||||||
|
'elapsed_s': int((self.info.get('ended') or time.time()) - self.info['started']),
|
||||||
|
'log': self.info['log'], 'log_tail': tail(self.info['log'], max(1, min(int(lines), 200)))}
|
||||||
|
if code is not None:
|
||||||
|
r['exit_code'] = code
|
||||||
|
pending = self._pending_restores()
|
||||||
|
if pending:
|
||||||
|
r['pending_restore'] = [os.path.basename(p) for p in pending]
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
with self._lock:
|
with self._lock:
|
||||||
if not self.running():
|
if self.running():
|
||||||
return {'ok': True, 'state': 'idle', 'note': '没有在跑的任务'}
|
self.info['stopped_by_user'] = True
|
||||||
self.info['stopped_by_user'] = True
|
pid = self.proc.pid
|
||||||
pid = self.proc.pid
|
if IS_WIN:
|
||||||
if IS_WIN:
|
subprocess.run(['taskkill', '/PID', str(pid), '/T', '/F'], capture_output=True)
|
||||||
subprocess.run(['taskkill', '/PID', str(pid), '/T', '/F'], capture_output=True)
|
else:
|
||||||
else:
|
try:
|
||||||
|
os.killpg(pid, signal.SIGKILL)
|
||||||
|
except ProcessLookupError:
|
||||||
|
pass
|
||||||
try:
|
try:
|
||||||
os.killpg(pid, signal.SIGKILL)
|
self.proc.wait(timeout=10)
|
||||||
except ProcessLookupError:
|
except subprocess.TimeoutExpired:
|
||||||
pass
|
return {'ok': False, 'error': '进程 %d 10 秒内没退出' % pid}
|
||||||
try:
|
self.info['ended'] = time.time()
|
||||||
self.proc.wait(timeout=10)
|
r = {'ok': True, 'state': 'stopped', 'task': self.info['task']}
|
||||||
except subprocess.TimeoutExpired:
|
else:
|
||||||
return {'ok': False, 'error': '进程 %d 10 秒内没退出' % pid}
|
r = {'ok': True, 'state': 'idle', 'note': '没有在跑的任务'}
|
||||||
self.info['ended'] = time.time()
|
# 强杀时任务的 finally 不会执行, 由这里把临时覆盖的次数写回
|
||||||
return {'ok': True, 'state': 'stopped', 'task': self.info['task']}
|
err = self._restore_leftovers()
|
||||||
|
if err:
|
||||||
|
r.update(ok=False, error=err)
|
||||||
|
return r
|
||||||
|
|
||||||
def _prune(self):
|
def _prune(self):
|
||||||
logs = sorted(glob.glob(os.path.join(self.run_dir, 'task_*.log')), key=os.path.getmtime)
|
logs = sorted(glob.glob(os.path.join(self.run_dir, 'task_*.log')), key=os.path.getmtime)
|
||||||
|
|||||||
Reference in New Issue
Block a user