hard-coded TTL to -1 on job.perform()

Removed merge artifacts
This commit is contained in:
glaslos 2015-03-19 15:32:01 +01:00
parent 3d4d6a86d5
commit 071c47dacb
2 changed files with 1 additions and 6 deletions

View File

@ -486,7 +486,7 @@ class Job(object):
def perform(self): # noqa
"""Invokes the job function with the job arguments."""
self.connection.persist(self.key)
self.ttl = self.connection.ttl(self.key)
self.ttl = -1
_job_stack.push(self.id)
try:
self._result = self.func(*self.args, **self.kwargs)

View File

@ -4,11 +4,6 @@ from __future__ import (absolute_import, division, print_function,
from datetime import datetime
from tests import RQTestCase
from tests.fixtures import (access_self, CallableObject, Number, say_hello,
some_calculation)
from tests.helpers import strip_microseconds
from rq.compat import as_text, PY2
from rq.exceptions import NoSuchJobError, UnpickleError
from rq.job import get_current_job, Job