Merge pull request #251 from tcely/patch-3

Patch the logic in `locked()`

Author: tcely

Dockerfile

@@ -367,6 +367,9 @@ RUN set -x && \
 # Copy root
 COPY config/root /
 
+# patch background_task
+ADD https://github.com/tcely/django-background-tasks/raw/refs/heads/locked-logic-fix/background_task/models.py /usr/local/lib/python3.11/dist-packages/background_task/models.py
+
 # Create a healthcheck
 HEALTHCHECK --interval=1m --timeout=10s --start-period=3m CMD ["/app/healthcheck.py", "http://127.0.0.1:8080/healthcheck"]
 

tubesync/sync/views.py

@@ -824,6 +824,11 @@ def get_context_data(self, *args, **kwargs):
         queryset = self.get_queryset()
         now = timezone.now()
         for task in queryset:
+            # There is broken logic in Task.objects.locked(), work around it.
+            # Without this, the queue never resumes properly.
+            if task.locked_by and not task.locked_by_pid_running():
+                task.locked_by = None
+                task.save()
             obj, url = map_task_to_instance(task)
             if not obj:
                 # Orphaned task, ignore it (it will be deleted when it fires)