Failed jobs will now auto expire (#1182)

rq/registry.py

@@ -197,7 +197,7 @@ class FailedJobRegistry(BaseRegistry):
 
         job.exc_info = exc_string
         job.save(pipeline=p, include_meta=False)
-        job.cleanup(ttl=-1, pipeline=p)  # failed job won't expire
+        job.cleanup(ttl=ttl, pipeline=p)
         p.zadd(self.key, {job.id: score})
 
         if not pipeline:

tests/test_registry.py

@@ -318,26 +318,25 @@ class TestFailedJobRegistry(RQTestCase):
 
         timestamp = current_timestamp()
         registry.add(job)
-        self.assertLess(
+        score = self.testconn.zscore(key, job.id)
-            self.testconn.zscore(key, job.id),
+        self.assertLess(score, timestamp + DEFAULT_FAILURE_TTL + 2)
-            timestamp + DEFAULT_FAILURE_TTL + 2
+        self.assertGreater(score, timestamp + DEFAULT_FAILURE_TTL - 2)
-        )
+
-        self.assertGreater(
+        # Job key will also expire
-            self.testconn.zscore(key, job.id),
+        job_ttl = self.testconn.ttl(job.key)
-            timestamp + DEFAULT_FAILURE_TTL - 2
+        self.assertLess(job_ttl, DEFAULT_FAILURE_TTL + 2)
-        )
+        self.assertGreater(job_ttl, DEFAULT_FAILURE_TTL - 2)
 
         timestamp = current_timestamp()
         ttl = 5
-        registry.add(job, ttl=5)
+        registry.add(job, ttl=ttl)
-        self.assertLess(
+        score = self.testconn.zscore(key, job.id)
-            self.testconn.zscore(key, job.id),
+        self.assertLess(score, timestamp + ttl + 2)
-            timestamp + ttl + 2
+        self.assertGreater(score, timestamp + ttl - 2)
-        )
+
-        self.assertGreater(
+        job_ttl = self.testconn.ttl(job.key)
-            self.testconn.zscore(key, job.id),
+        self.assertLess(job_ttl, ttl + 2)
-            timestamp + ttl - 2
+        self.assertGreater(job_ttl, ttl - 2)
-        )
 
     def test_requeue(self):
         """FailedJobRegistry.requeue works properly"""