Merge hotfix/0.2.2

CHANGES.md

@@ -27,6 +27,12 @@
       some_work.delay(2, 3)
 
 
+### 0.2.2
+(August 1st, 2012)
+
+- Fix bug where return values that couldn't be pickled crashed the worker
+
+
 ### 0.2.1
 (July 20th, 2012)
 

rq/version.py

@@ -1 +1 @@
-VERSION = '0.2.1'
+VERSION = '0.2.2'

rq/worker.py

@@ -362,6 +362,10 @@ class Worker(object):
         try:
             with death_penalty_after(job.timeout or 180):
                 rv = job.perform()
+
+            # Pickle the result in the same try-except block since we need to
+            # use the same exc handling when pickling fails
+            pickled_rv = dumps(rv)
         except Exception as e:
             fq = self.failed_queue
             self.log.exception(red(str(e)))
@@ -377,7 +381,7 @@ class Worker(object):
 
         if rv is not None:
             p = self.connection.pipeline()
-            p.hset(job.key, 'result', dumps(rv))
+            p.hset(job.key, 'result', pickled_rv)
             p.expire(job.key, self.rv_ttl)
             p.execute()
         else: