Skip to content

Commit fcd6cd9

Browse files
committed
add worker desc in Failure
1 parent 6cfa8d4 commit fcd6cd9

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/pyres/failure.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from pyres import ResQ
33
import sys, traceback
44
class Failure(object):
5-
def __init__(self, exp, queue, payload):
5+
def __init__(self, exp, worker, queue, payload):
66
excc, _, tb = sys.exc_info()
77

88
self._exception = excc
99
self._traceback = tb
10-
#self._worker = worker
10+
self._worker = worker
1111
self._queue = queue
1212
self._payload = payload
1313

@@ -30,7 +30,8 @@ def save(self, resq):
3030
'payload' : self._payload,
3131
'error' : self._parse_message(self._exception),
3232
'backtrace' : self._parse_traceback(self._traceback),
33-
'queue' : self._queue
33+
'queue' : self._queue,
34+
'worker' : self._worker
3435
}
3536
data = ResQ.encode(data)
3637
resq.redis.push('resque:failed', data)

src/pyres/job.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
from pyres import ResQ, str_to_class
22
from pyres.failure import Failure
33
class Job(object):
4-
def __init__(self, queue, payload, resq):
4+
def __init__(self, queue, payload, resq, worker):
55
self._queue = queue
66
self._payload = payload
77
self.resq = resq
8+
self._worker = worker
89

910
def perform(self):
1011
payload_class_str = self._payload["class"]
@@ -17,11 +18,11 @@ def perform(self):
1718

1819
def fail(self, exception):
1920
#Failure.create(exception)
20-
failure = Failure(exception, self._queue, self._payload)
21+
failure = Failure(exception, self._worker, self._queue, self._payload)
2122
failure.save(self.resq)
2223

2324
@classmethod
24-
def reserve(cls, queue, res):
25+
def reserve(cls, queue, res, worker):
2526
payload = res.pop(queue)
2627
if payload:
27-
return cls(queue, payload, res)
28+
return cls(queue, payload, res, worker)

src/pyres/worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def process(self, job=None):
128128
def reserve(self):
129129
for q in self.queues:
130130
print "Checking %s" % q
131-
job = Job.reserve(q, self.resq)
131+
job = Job.reserve(q, self.resq, self.__str__())
132132
if job:
133133
print "Found job on %s" % q
134134
return job

0 commit comments

Comments
 (0)