Constant for DEFAULT_RUNNER_LOOP_DELAY, admin action to mark ready for deletion

Author: dcwatson

src/dbtasks/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from django.tasks import TaskResultStatus
+from django.utils import timezone
 
 from .models import ScheduledTask
 
@@ -22,8 +23,13 @@ class ScheduledTaskAdmin(admin.ModelAdmin):
         "queue",
         "backend",
     ]
-    actions = ["run_task"]
+    actions = ["mark_ready", "mark_deletion"]
+    ordering = ["-enqueued_at"]
 
     @admin.action(description="Mark ready to run now")
-    def run_task(self, request, queryset):
+    def mark_ready(self, request, queryset):
         queryset.update(status=TaskResultStatus.READY, run_after=None)
+
+    @admin.action(description="Mark ready for deletion")
+    def mark_deletion(self, request, queryset):
+        queryset.update(delete_after=timezone.now())

src/dbtasks/contrib/serve/management/commands/serve.py

@@ -8,6 +8,8 @@
 from django.core.management import BaseCommand
 from django.tasks import DEFAULT_TASK_BACKEND_ALIAS
 
+from dbtasks.defaults import DEFAULT_RUNNER_LOOP_DELAY
+
 try:
     from granian import Granian
     from granian.constants import Interfaces
@@ -80,8 +82,8 @@ def add_arguments(self, parser):
         parser.add_argument(
             "--delay",
             type=float,
-            default=1.0,
-            help="Task runner loop delay [default=1.0]",
+            default=DEFAULT_RUNNER_LOOP_DELAY,
+            help=f"Task runner loop delay [default={DEFAULT_RUNNER_LOOP_DELAY}]",
         )
         parser.add_argument(
             "--no-periodic",

src/dbtasks/defaults.py

@@ -0,0 +1,2 @@
+# How often a runner should poll the database for new tasks.
+DEFAULT_RUNNER_LOOP_DELAY = 1.0

src/dbtasks/management/commands/taskrunner.py

@@ -4,6 +4,7 @@
 from django.core.management import BaseCommand, CommandParser
 from django.tasks import DEFAULT_TASK_BACKEND_ALIAS
 
+from dbtasks.defaults import DEFAULT_RUNNER_LOOP_DELAY
 from dbtasks.runner import Runner
 
 
@@ -38,8 +39,8 @@ def add_arguments(self, parser: CommandParser):
         parser.add_argument(
             "--delay",
             type=float,
-            default=1.0,
-            help="Loop delay [default=1.0]",
+            default=DEFAULT_RUNNER_LOOP_DELAY,
+            help=f"Loop delay [default={DEFAULT_RUNNER_LOOP_DELAY}]",
         )
         parser.add_argument(
             "--no-periodic",

src/dbtasks/runner.py

@@ -20,6 +20,7 @@
 from django.utils.module_loading import import_string
 
 from .backend import DatabaseBackend
+from .defaults import DEFAULT_RUNNER_LOOP_DELAY
 from .models import ScheduledTask
 from .periodic import Periodic
 
@@ -51,7 +52,7 @@ def __init__(
         workers: int = 4,
         worker_id: str | None = None,
         backend: str = DEFAULT_TASK_BACKEND_ALIAS,
-        loop_delay: float = 1.0,
+        loop_delay: float = DEFAULT_RUNNER_LOOP_DELAY,
         init_periodic: bool = True,
     ):
         self.workers = workers
@@ -217,13 +218,15 @@ def delete_tasks(self):
         """
         Deletes any finished tasks scheduled for deletion before now.
         """
-        return ScheduledTask.objects.filter(
+        deleted = ScheduledTask.objects.filter(
             delete_after__lt=timezone.now(),
             status__in=[TaskResultStatus.SUCCESSFUL, TaskResultStatus.FAILED],
             # TODO: allow runner to specify which backend/queues to process
             backend=self.backend.alias,
             queue__in=self.backend.queues,
-        ).delete()
+        ).delete()[0]
+        if deleted:
+            logger.debug(f"Removed {deleted} completed task(s)")
 
     def init_periodic(self):
         """