fix workflow scheduler

This commit is contained in:
jxxghp
2025-02-26 18:32:25 +08:00
parent eec25113b5
commit 835e6e8891
+6 -5
View File
@@ -506,6 +506,7 @@ class Scheduler(metaclass=Singleton):
self._jobs[job_id] = { self._jobs[job_id] = {
"func": WorkflowChain().process, "func": WorkflowChain().process,
"name": workflow.name, "name": workflow.name,
"provider_name": "工作流",
"running": False, "running": False,
} }
self._scheduler.add_job( self._scheduler.add_job(
@@ -550,7 +551,7 @@ class Scheduler(metaclass=Singleton):
"func": service["func"], "func": service["func"],
"name": service["name"], "name": service["name"],
"pid": pid, "pid": pid,
"plugin_name": plugin_name, "provider_name": plugin_name,
"kwargs": service.get("func_kwargs") or {}, "kwargs": service.get("func_kwargs") or {},
"running": False, "running": False,
} }
@@ -587,14 +588,14 @@ class Scheduler(metaclass=Singleton):
# 将正在运行的任务提取出来 (保障一次性任务正常显示) # 将正在运行的任务提取出来 (保障一次性任务正常显示)
for job_id, service in self._jobs.items(): for job_id, service in self._jobs.items():
name = service.get("name") name = service.get("name")
plugin_name = service.get("plugin_name") provider_name = service.get("provider_name")
if service.get("running") and name and plugin_name: if service.get("running") and name and provider_name:
if name not in added: if name not in added:
added.append(name) added.append(name)
schedulers.append(schemas.ScheduleInfo( schedulers.append(schemas.ScheduleInfo(
id=job_id, id=job_id,
name=name, name=name,
provider=plugin_name, provider=provider_name,
status="正在运行", status="正在运行",
)) ))
# 获取其他待执行任务 # 获取其他待执行任务
@@ -614,7 +615,7 @@ class Scheduler(metaclass=Singleton):
schedulers.append(schemas.ScheduleInfo( schedulers.append(schemas.ScheduleInfo(
id=job_id, id=job_id,
name=job.name, name=job.name,
provider=service.get("plugin_name", "[系统]"), provider=service.get("provider_name", "[系统]"),
status=status, status=status,
next_run=next_run next_run=next_run
)) ))