Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix JobScheduler to run jobs in plugins's order

Browse source
This commit is contained in:
Théophile Diot 2024-10-24 17:57:05 +02:00
parent 6e43766e23
commit 7b5eac44b3
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/scheduler/JobScheduler.py
View file

@ -213,7 +213,7 @@ class JobScheduler(ApiCaller):
self.__job_reload = False
# Use ThreadPoolExecutor to run jobs
futures = [self.__executor.submit(self.__run_job_with_semaphore, job.run) for job in pending_jobs]
futures = [self.__executor.submit(self.__run_jobs_with_semaphore, [job.run]) for job in pending_jobs]
# Wait for all jobs to complete
for future in futures:
@ -255,9 +255,9 @@ class JobScheduler(ApiCaller):
plugins = plugins or []
# Create a list of all jobs to run
jobs_to_run = []
futures = []
for plugin, jobs in self.__jobs.items():
jobs_to_run = []
if plugins and plugin not in plugins:
continue
for job in jobs:
@ -270,9 +270,7 @@ class JobScheduler(ApiCaller):
job["file"],
)
)
# Use ThreadPoolExecutor to run jobs
futures = [self.__executor.submit(self.__run_job_with_semaphore, job_func) for job_func in jobs_to_run]
futures.append(self.__executor.submit(self.__run_jobs_with_semaphore, jobs_to_run))
# Wait for all jobs to complete
for future in futures:
@ -314,9 +312,10 @@ class JobScheduler(ApiCaller):
self.__lock.release()
return self.__job_success
def __run_job_with_semaphore(self, job_func):
def __run_jobs_with_semaphore(self, jobs):
with self.__semaphore:
job_func()
for job in jobs:
job()
def clear(self):
schedule.clear()