Skip to content

fix(backup): a malformed request fails its own result instead of crashing the service #61

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

Merged
AmrMsCLL merged 1 commit into from
Nov 7, 2026
Merged

fix(backup): a malformed request fails its own result instead of crashing the service #61

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
15 changes: 10 additions & 5 deletions edge/backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,11 @@ def restore(project, name):
def handle(request):
working = request.with_suffix(".running")
request.replace(working)
order = json.loads(working.read_text(encoding="utf-8"))
log(f"{order['action']} {order.get('project')} {order.get('archive', '')} for {order.get('by')}")
result = {**order, "at": datetime.datetime.now(datetime.UTC).isoformat()}
result = {"at": datetime.datetime.now(datetime.UTC).isoformat()}
try:
order = json.loads(working.read_text(encoding="utf-8"))
result.update(order)
log(f"{order['action']} {order.get('project')} {order.get('archive', '')} for {order.get('by')}")
if order["action"] == "run":
summaries = run(order["project"])
result.update(ok=all(entry["ok"] for entry in summaries), output="; ".join(f"{entry['project']}: {'verified' if entry['ok'] else '; '.join(entry['errors'])}" for entry in summaries))
Expand All @@ -391,7 +392,7 @@ def handle(request):
result.update(ok=False, output=str(error))
working.with_suffix(".result").write_text(json.dumps(result), encoding="utf-8")
working.unlink()
log(f"{order['action']} {order.get('project')}: {'done' if result['ok'] else 'FAILED: ' + result['output']}")
log(f"{result.get('action')} {result.get('project')}: {'done' if result['ok'] else 'FAILED: ' + result['output']}")


def due(plan, last, now):
Expand All @@ -402,7 +403,11 @@ def serve():
for folder in (REQUESTS, WORK):
folder.mkdir(parents=True, exist_ok=True)
for interrupted in REQUESTS.glob("*.running"):
interrupted.with_suffix(".result").write_text(json.dumps({**json.loads(interrupted.read_text(encoding="utf-8")), "ok": False, "output": "interrupted by a restart"}), encoding="utf-8")
try:
order = json.loads(interrupted.read_text(encoding="utf-8"))
except (OSError, json.JSONDecodeError):
order = {}
interrupted.with_suffix(".result").write_text(json.dumps({**order, "ok": False, "output": "interrupted by a restart"}), encoding="utf-8")
interrupted.unlink()
last = datetime.datetime.now(datetime.UTC)
plan = schedule()
Expand Down
Loading