Skip to content

Commit 6d99c05

Browse files
mjrussoMatt George
authored andcommitted
fix crash due to logging when enqueueing job with more than one argument
1 parent 3b96917 commit 6d99c05

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

pyres/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def enqueue(self, klass, *args):
137137
self.push(queue, {'class':class_name,'args':args})
138138
logging.info("enqueued '%s' job" % class_name)
139139
if args:
140-
logging.debug("job arguments: %s" % args)
140+
logging.debug("job arguments: %s" % str(args))
141141
else:
142142
logging.debug("no arguments passed in.")
143143
else:
@@ -146,7 +146,10 @@ def enqueue(self, klass, *args):
146146
def enqueue_from_string(self, klass_as_string, queue, *args):
147147
self.push(queue, {'class':klass_as_string,'args':args})
148148
logging.info("enqueued '%s' job" % klass_as_string)
149-
logging.debug("job arguments: %s" % args)
149+
if args:
150+
logging.debug("job arguments: %s" % str(args))
151+
else:
152+
logging.debug("no arguments passed in.")
150153

151154
def queues(self):
152155
return self.redis.smembers("resque:queues") or []

tests/test_resq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class ResQTests(PyResTests):
77
def test_enqueue(self):
88
self.resq.enqueue(Basic,"test1")
9-
self.resq.enqueue(Basic,"test2")
9+
self.resq.enqueue(Basic,"test2", "moretest2args")
1010
ResQ._enqueue(Basic, "test3")
1111
assert self.redis.llen("resque:queue:basic") == 3
1212
assert self.redis.sismember('resque:queues','basic')

0 commit comments

Comments
 (0)