Merge branch 'dev' into dev2
This commit is contained in:
commit
a453ae0f3c
|
|
@ -169,30 +169,30 @@ def execute_job(self, job_id: str | None = None, snapshot_params: dict[str, Any]
|
|||
)
|
||||
else:
|
||||
if not snapshot:
|
||||
snapshot = snapshot_params or {
|
||||
"job_id": job_id,
|
||||
"handler_path": handler_path if "handler_path" in locals() else "",
|
||||
"public_cfg": public_cfg if "public_cfg" in locals() else {},
|
||||
"secret_cfg": secret_token if "secret_token" in locals() else "",
|
||||
"meta": {
|
||||
"trigger": "celery",
|
||||
snapshot = snapshot_params or {
|
||||
"job_id": job_id,
|
||||
"handler_path": handler_path if "handler_path" in locals() else "",
|
||||
"public_cfg": public_cfg if "public_cfg" in locals() else {},
|
||||
"secret_cfg": secret_token if "secret_token" in locals() else "",
|
||||
"meta": {
|
||||
"trigger": "celery",
|
||||
"celery_task_id": celery_task_id,
|
||||
"started_at": started_at.isoformat(),
|
||||
},
|
||||
}
|
||||
crud.create_job_log(
|
||||
session,
|
||||
job_id=str(job_id or ""),
|
||||
status=status,
|
||||
snapshot_params=snapshot,
|
||||
message=message,
|
||||
traceback=traceback,
|
||||
run_log=run_log_text,
|
||||
"started_at": started_at.isoformat(),
|
||||
},
|
||||
}
|
||||
crud.create_job_log(
|
||||
session,
|
||||
job_id=str(job_id or ""),
|
||||
status=status,
|
||||
snapshot_params=snapshot,
|
||||
message=message,
|
||||
traceback=traceback,
|
||||
run_log=run_log_text,
|
||||
celery_task_id=celery_task_id,
|
||||
attempt=attempt,
|
||||
started_at=started_at,
|
||||
finished_at=finished_at,
|
||||
)
|
||||
started_at=started_at,
|
||||
finished_at=finished_at,
|
||||
)
|
||||
session.close()
|
||||
|
||||
return {"status": status.value, "job_id": job_id, "result": result, "message": message}
|
||||
|
|
|
|||
Loading…
Reference in New Issue