Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions django_celery_beat/schedulers.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,22 @@
def all_as_schedule(self):
debug('DatabaseScheduler: Fetching database schedule')
s = {}
for model in self.enabled_models():
try:
s[model.name] = self.Entry(model, app=self.app)
except ValueError:
pass

Check warning on line 271 in django_celery_beat/schedulers.py

View check run for this annotation

Codecov / codecov/patch

django_celery_beat/schedulers.py#L270-L271

Added lines #L270 - L271 were not covered by tests
return s

def enabled_models(self):
"""Return list of enabled periodic tasks.

Allows overriding how the list of periodic tasks is fetched without
duplicating the filtering/querying logic.
"""
return list(self.enabled_models_qs())

def enabled_models_qs(self):
next_schedule_sync = now() + datetime.timedelta(
seconds=SCHEDULE_SYNC_MAX_INTERVAL
)
Expand All @@ -278,12 +294,7 @@
exclude_query = exclude_clock_tasks_query | exclude_cron_tasks_query

# Fetch only the tasks we need to consider
for model in self.Model.objects.enabled().exclude(exclude_query):
try:
s[model.name] = self.Entry(model, app=self.app)
except ValueError:
pass
return s
return self.Model.objects.enabled().exclude(exclude_query)

def _get_crontab_exclude_query(self):
"""
Expand Down