Skip to content

fix(cron): handle bare-list jobs.json in load_jobs() #30208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aim-ma-sourcing wants to merge 1 commit into from
Closed

fix(cron): handle bare-list jobs.json in load_jobs() #30208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cron/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,15 +410,25 @@ def load_jobs() -> List[Dict[str, Any]]:
try:
with open(JOBS_FILE, 'r', encoding='utf-8') as f:
data = json.load(f)
# Accept both {"jobs": [...]} and bare [...] formats.
# Bare lists can appear from older versions, distribution installs,
# or snapshot restores. Auto-repair to canonical format.
if isinstance(data, list):
logger.warning("Auto-repaired jobs.json (bare list → {\"jobs\": [...]})")
save_jobs(data)
return data
return data.get("jobs", [])
except json.JSONDecodeError:
# Retry with strict=False to handle bare control chars in string values
try:
with open(JOBS_FILE, 'r', encoding='utf-8') as f:
data = json.loads(f.read(), strict=False)
jobs = data.get("jobs", [])
if isinstance(data, list):
jobs = data
else:
jobs = data.get("jobs", [])
if jobs:
# Auto-repair: rewrite with proper escaping
# Auto-repair: rewrite with proper escaping and canonical format
save_jobs(jobs)
logger.warning("Auto-repaired jobs.json (had invalid control characters)")
return jobs
Expand Down