renaming job.job_ttl to job.ttl

main
glaslos 10 years ago
parent 55c541bc59
commit 8a3fd91e2e

@ -92,7 +92,7 @@ class Job(object):
# Job construction # Job construction
@classmethod @classmethod
def create(cls, func, args=None, kwargs=None, connection=None, def create(cls, func, args=None, kwargs=None, connection=None,
result_ttl=None, job_ttl=None, status=None, description=None, depends_on=None, timeout=None, result_ttl=None, ttl=None, status=None, description=None, depends_on=None, timeout=None,
id=None): id=None):
"""Creates a new Job instance for the given function, arguments, and """Creates a new Job instance for the given function, arguments, and
keyword arguments. keyword arguments.
@ -131,7 +131,7 @@ class Job(object):
# Extra meta data # Extra meta data
job.description = description or job.get_call_string() job.description = description or job.get_call_string()
job.result_ttl = result_ttl job.result_ttl = result_ttl
job.job_ttl = job_ttl job.ttl = ttl
job.timeout = timeout job.timeout = timeout
job._status = status job._status = status
@ -312,7 +312,7 @@ class Job(object):
self.exc_info = None self.exc_info = None
self.timeout = None self.timeout = None
self.result_ttl = None self.result_ttl = None
self.job_ttl = None self.ttl = None
self._status = None self._status = None
self._dependency_id = None self._dependency_id = None
self.meta = {} self.meta = {}
@ -457,8 +457,8 @@ class Job(object):
connection = pipeline if pipeline is not None else self.connection connection = pipeline if pipeline is not None else self.connection
connection.hmset(key, self.to_dict()) connection.hmset(key, self.to_dict())
if self.job_ttl: if self.ttl:
connection.expire(key, self.job_ttl) connection.expire(key, self.ttl)
def cancel(self): def cancel(self):
"""Cancels the given job, which will prevent the job from ever being """Cancels the given job, which will prevent the job from ever being
@ -499,7 +499,7 @@ class Job(object):
persisted. In the future, this method will also be responsible persisted. In the future, this method will also be responsible
for determining ttl for repeated jobs. for determining ttl for repeated jobs.
""" """
return default_ttl if self.job_ttl is None else self.job_ttl return default_ttl if self.ttl is None else self.ttl
def get_result_ttl(self, default_ttl=None): def get_result_ttl(self, default_ttl=None):
"""Returns ttl for a job that determines how long a jobs result will """Returns ttl for a job that determines how long a jobs result will

@ -167,7 +167,7 @@ class Queue(object):
connection.rpush(self.key, job_id) connection.rpush(self.key, job_id)
def enqueue_call(self, func, args=None, kwargs=None, timeout=None, def enqueue_call(self, func, args=None, kwargs=None, timeout=None,
result_ttl=None, job_ttl=None, description=None, result_ttl=None, ttl=None, description=None,
depends_on=None, job_id=None): depends_on=None, job_id=None):
"""Creates a job to represent the delayed function call and enqueues """Creates a job to represent the delayed function call and enqueues
it. it.
@ -180,7 +180,7 @@ class Queue(object):
# TODO: job with dependency shouldn't have "queued" as status # TODO: job with dependency shouldn't have "queued" as status
job = self.job_class.create(func, args, kwargs, connection=self.connection, job = self.job_class.create(func, args, kwargs, connection=self.connection,
result_ttl=result_ttl, job_ttl=job_ttl, status=Status.QUEUED, result_ttl=result_ttl, ttl=ttl, status=Status.QUEUED,
description=description, depends_on=depends_on, timeout=timeout, description=description, depends_on=depends_on, timeout=timeout,
id=job_id) id=job_id)
@ -229,7 +229,7 @@ class Queue(object):
timeout = kwargs.pop('timeout', None) timeout = kwargs.pop('timeout', None)
description = kwargs.pop('description', None) description = kwargs.pop('description', None)
result_ttl = kwargs.pop('result_ttl', None) result_ttl = kwargs.pop('result_ttl', None)
job_ttl = kwargs.pop('job_ttl', None) ttl = kwargs.pop('ttl', None)
depends_on = kwargs.pop('depends_on', None) depends_on = kwargs.pop('depends_on', None)
job_id = kwargs.pop('job_id', None) job_id = kwargs.pop('job_id', None)
@ -239,7 +239,7 @@ class Queue(object):
kwargs = kwargs.pop('kwargs', None) kwargs = kwargs.pop('kwargs', None)
return self.enqueue_call(func=f, args=args, kwargs=kwargs, return self.enqueue_call(func=f, args=args, kwargs=kwargs,
timeout=timeout, result_ttl=result_ttl, job_ttl=job_ttl, timeout=timeout, result_ttl=result_ttl, ttl=ttl,
description=description, depends_on=depends_on, description=description, depends_on=depends_on,
job_id=job_id) job_id=job_id)

@ -305,10 +305,10 @@ class TestJob(RQTestCase):
def test_get_job_ttl(self): def test_get_job_ttl(self):
"""Getting job TTL.""" """Getting job TTL."""
job_ttl = 1 ttl = 1
job = Job.create(func=say_hello, job_ttl=job_ttl) job = Job.create(func=say_hello, ttl=ttl)
job.save() job.save()
self.assertEqual(job.get_ttl(), job_ttl) self.assertEqual(job.get_ttl(), ttl)
job = Job.create(func=say_hello) job = Job.create(func=say_hello)
job.save() job.save()
self.assertEqual(job.get_ttl(), None) self.assertEqual(job.get_ttl(), None)

Loading…
Cancel
Save