vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: Duplicate enqueue checks

Browse source 
scheduled_job_type.enqueue already does check for duplicate job and is
more "recent"
This commit is contained in:
Ankush Menat 2022-12-14 12:44:37 +05:30 • committed by Ankush Menat
parent 2b050f9fc3
commit d13ab320b7
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
View file

@ -22,7 +22,7 @@ class ScheduledJobType(Document):
# force logging for all events other than continuous ones (ALL)
self.create_log = 1
def enqueue(self, force=False):
def enqueue(self, force=False) -> bool:
# enqueue event if last execution is done
if self.is_event_due() or force:
if not self.is_job_in_queue():

10
frappe/utils/scheduler.py
View file

@ -83,15 +83,11 @@ def enqueue_events_for_site(site: str) -> None:
def enqueue_events(site: str) -> list[str] | None:
if schedule_jobs_based_on_activity():
queued_jobs = get_jobs(site=site, key="job_type").get(site) or []
enqueued_jobs = []
for job_type in frappe.get_all("Scheduled Job Type", ("name", "method"), {"stopped": 0}):
if not job_type.method in queued_jobs:
# don't add it to queue if still pending
job_type = frappe.get_cached_doc("Scheduled Job Type", job_type.name)
if job_type.enqueue():
enqueued_jobs.append(job_type.method)
job_type = frappe.get_cached_doc("Scheduled Job Type", job_type.name)
if _enqueued := job_type.enqueue():
enqueued_jobs.append(job_type.method)
return enqueued_jobs