liwei
/
Vastai-ConnectHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev2

This commit is contained in:
Marsway 2026-01-13 10:01:26 +08:00
parent 214fd589dd 1435653b0b
commit a453ae0f3c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/tasks/execute.py
View File

@ -169,30 +169,30 @@ def execute_job(self, job_id: str | None = None, snapshot_params: dict[str, Any]
) )
else: else:
if not snapshot: if not snapshot:
snapshot = snapshot_params or { snapshot = snapshot_params or {
"job_id": job_id, "job_id": job_id,
"handler_path": handler_path if "handler_path" in locals() else "", "handler_path": handler_path if "handler_path" in locals() else "",
"public_cfg": public_cfg if "public_cfg" in locals() else {}, "public_cfg": public_cfg if "public_cfg" in locals() else {},
"secret_cfg": secret_token if "secret_token" in locals() else "", "secret_cfg": secret_token if "secret_token" in locals() else "",
"meta": { "meta": {
"trigger": "celery", "trigger": "celery",
"celery_task_id": celery_task_id, "celery_task_id": celery_task_id,
"started_at": started_at.isoformat(), "started_at": started_at.isoformat(),
}, },
} }
crud.create_job_log( crud.create_job_log(
session, session,
job_id=str(job_id or ""), job_id=str(job_id or ""),
status=status, status=status,
snapshot_params=snapshot, snapshot_params=snapshot,
message=message, message=message,
traceback=traceback, traceback=traceback,
run_log=run_log_text, run_log=run_log_text,
celery_task_id=celery_task_id, celery_task_id=celery_task_id,
attempt=attempt, attempt=attempt,
started_at=started_at, started_at=started_at,
finished_at=finished_at, finished_at=finished_at,
) )
session.close() session.close()
return {"status": status.value, "job_id": job_id, "result": result, "message": message} return {"status": status.value, "job_id": job_id, "result": result, "message": message}