Renamed worker.set_job_id() and worker.get_job_id() for consistency.

rq/worker.py

@@ -231,25 +231,24 @@ class Worker(object):
             "worker.state is deprecated, use worker.get_state() instead."
         )
         return self.get_state()
-    
-    state = property(_get_state, _set_state)
 
-    def set_job_id(self, new_job_id, pipeline=None):
+    state = property(_get_state, _set_state)
-        self._job_id = new_job_id
 
+    def set_current_job_id(self, job_id, pipeline=None):
         connection = pipeline if pipeline is not None else self.connection
 
-        if new_job_id is None:
+        if job_id is None:
             connection.hdel(self.key, 'current_job')
         else:
-            connection.hset(self.key, 'current_job', new_job_id)
+            connection.hset(self.key, 'current_job', job_id)
 
-    def get_job_id(self):
+    def get_current_job_id(self, pipeline=None):
-        return self._job_id
+        connection = pipeline if pipeline is not None else self.connection
+        return connection.hget(self.key, 'current_job')
 
     def get_current_job(self):
         """Returns the job id of the currently executing job."""
-        job_id = self.get_job_id()
+        job_id = self.get_current_job_id()
 
         if job_id is None:
             return None
@@ -346,7 +345,7 @@ class Worker(object):
                 self.set_state('busy')
 
                 job, queue = result
-                self.set_job_id(job.id)
+                self.set_current_job_id(job.id)
 
                 # Use the public setter here, to immediately update Redis
                 job.status = Status.STARTED
@@ -356,7 +355,7 @@ class Worker(object):
                 self.heartbeat((job.timeout or 180) + 60)
                 self.execute_job(job)
                 self.heartbeat()
-                self.set_job_id(None)
+                self.set_current_job_id(None)
                 
                 if job.status == Status.FINISHED:
                     queue.enqueue_dependents(job)

tests/test_worker.py

@@ -257,9 +257,9 @@ class TestWorker(RQTestCase):
         job = q.enqueue_call(say_hello)
 
         self.assertEqual(self.testconn.hget(worker.key, 'current_job'), None)
-        worker.set_job_id(job.id)
+        worker.set_current_job_id(job.id)
         self.assertEqual(
-            worker.get_job_id(),
+            worker.get_current_job_id(),
             self.testconn.hget(worker.key, 'current_job')
         )
         self.assertEqual(worker.get_current_job(), job)