ys/GenericAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from kuishou68/fix/issue-75-scheduler-errors

Browse Source 
fix: guard _parse_cooldown against malformed repeat values; close file handle with context manager
This commit is contained in:
LJQ
2026-04-16 13:22:48 +08:00
committed by GitHub
parent 0591b68ff6 fefd9b99cc
commit 315ce293df
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
reflect/scheduler.py
View File

@@ -36,12 +36,15 @@ def _parse_cooldown(repeat):
if repeat == 'weekly': return timedelta(days=6) if repeat == 'weekly': return timedelta(days=6)
if repeat == 'monthly': return timedelta(days=27) if repeat == 'monthly': return timedelta(days=27)
if repeat.startswith('every_'): if repeat.startswith('every_'):
parts = repeat.split('_') try:
n = int(parts[1].rstrip('hdm')) parts = repeat.split('_')
u = parts[1][-1] n = int(parts[1].rstrip('hdm'))
if u == 'h': return timedelta(hours=n) u = parts[1][-1]
if u == 'm': return timedelta(minutes=n) if u == 'h': return timedelta(hours=n)
if u == 'd': return timedelta(days=n) if u == 'm': return timedelta(minutes=n)
if u == 'd': return timedelta(days=n)
except (ValueError, IndexError):
pass # fall through to warning below
_logger.warning(f'Unknown repeat type: {repeat}, fallback to 20h cooldown') _logger.warning(f'Unknown repeat type: {repeat}, fallback to 20h cooldown')
return timedelta(hours=20) return timedelta(hours=20)
@@ -78,7 +81,8 @@ def check():
if not f.endswith('.json'): continue if not f.endswith('.json'): continue
tid = f[:-5] tid = f[:-5]
try: try:
task = json.loads(open(os.path.join(TASKS, f), encoding='utf-8').read()) with open(os.path.join(TASKS, f), encoding='utf-8') as fp:
task = json.loads(fp.read())
except Exception as e: except Exception as e:
_logger.error(f'JSON parse error for {f}: {e}') _logger.error(f'JSON parse error for {f}: {e}')
continue continue