From 835e6e889170f41be98b014ea8907deddb223e2b Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 26 Feb 2025 18:32:25 +0800 Subject: [PATCH] fix workflow scheduler --- app/scheduler.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/scheduler.py b/app/scheduler.py index 5a11d7ad..1beb1ef7 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -506,6 +506,7 @@ class Scheduler(metaclass=Singleton): self._jobs[job_id] = { "func": WorkflowChain().process, "name": workflow.name, + "provider_name": "工作流", "running": False, } self._scheduler.add_job( @@ -550,7 +551,7 @@ class Scheduler(metaclass=Singleton): "func": service["func"], "name": service["name"], "pid": pid, - "plugin_name": plugin_name, + "provider_name": plugin_name, "kwargs": service.get("func_kwargs") or {}, "running": False, } @@ -587,14 +588,14 @@ class Scheduler(metaclass=Singleton): # 将正在运行的任务提取出来 (保障一次性任务正常显示) for job_id, service in self._jobs.items(): name = service.get("name") - plugin_name = service.get("plugin_name") - if service.get("running") and name and plugin_name: + provider_name = service.get("provider_name") + if service.get("running") and name and provider_name: if name not in added: added.append(name) schedulers.append(schemas.ScheduleInfo( id=job_id, name=name, - provider=plugin_name, + provider=provider_name, status="正在运行", )) # 获取其他待执行任务 @@ -614,7 +615,7 @@ class Scheduler(metaclass=Singleton): schedulers.append(schemas.ScheduleInfo( id=job_id, name=job.name, - provider=service.get("plugin_name", "[系统]"), + provider=service.get("provider_name", "[系统]"), status=status, next_run=next_run ))