Pull worker name from RQ results

Author: RealOrangeOne

django_tasks/backends/rq.py

@@ -1,4 +1,5 @@
 from collections.abc import Iterable
+from importlib.metadata import version
 from types import TracebackType
 from typing import Any, TypeVar
 
@@ -47,10 +48,6 @@
 
 class Job(BaseJob):
     def perform(self) -> Any:
-        assert self.worker_name is not None
-        self.meta.setdefault("_django_tasks_worker_ids", []).append(self.worker_name)
-        self.save_meta()  # type: ignore[no-untyped-call]
-
         task_started.send(
             type(self.task_result.task.get_backend()), task_result=self.task_result
         )
@@ -113,14 +110,18 @@ def task_result(self) -> TaskResult:
             kwargs=self.kwargs,
             backend=self.meta["backend_name"],
             errors=[],
-            worker_ids=self.meta.get("_django_tasks_worker_ids", []),
+            worker_ids=[],
         )
 
         exception_classes = self.meta.get("_django_tasks_exceptions", []).copy()
 
+        if self.worker_name and task_result.status == ResultStatus.RUNNING:
+            task_result.worker_ids.append(self.worker_name)
+
         rq_results = self.results()
 
         for rq_result in rq_results:
+            task_result.worker_ids.append(rq_result.worker_name)
             if rq_result.type == Result.Type.FAILED:
                 task_result.errors.append(
                     TaskError(
@@ -272,3 +273,9 @@ def check(self, **kwargs: Any) -> Iterable[messages.CheckMessage]:
                     f"{queue_name!r} is not configured for django-rq",
                     f"Add {queue_name!r} to RQ_QUEUES",
                 )
+
+        if tuple(map(int, (version("rq").split(".")))) < (2, 5, 0):
+            yield messages.Error(
+                "Only rq >= 2.5.0 is supported, found " + version("rq"),
+                "Install a newer version of rq",
+            )

pyproject.toml

@@ -64,6 +64,7 @@ postgres = [
 ]
 rq = [
     "django-rq",
+    "rq>=2.5",
     "rq_scheduler",
 ]
 

tests/tests/test_rq_backend.py

@@ -61,7 +61,7 @@ def get_fake_connection(
     },
 )
 @modify_settings(INSTALLED_APPS={"append": ["django_rq"]})
-class DatabaseBackendTestCase(TransactionTestCase):
+class RQBackendTestCase(TransactionTestCase):
     def setUp(self) -> None:
         super().setUp()