r7484 - dumbhippo/trunk/firehose/firehose/jobs

[commits mugshot org]

Author: walters
Date: 2008-05-30 12:42:37 -0500 (Fri, 30 May 2008)
New Revision: 7484

Modified:
   dumbhippo/trunk/firehose/firehose/jobs/poller.py
Log:
Be sure to always push a result onto the queue


Modified: dumbhippo/trunk/firehose/firehose/jobs/poller.py
===================================================================
--- dumbhippo/trunk/firehose/firehose/jobs/poller.py	2008-05-14 15:06:55 UTC (rev 7483)
+++ dumbhippo/trunk/firehose/firehose/jobs/poller.py	2008-05-30 17:42:37 UTC (rev 7484)
@@ -320,12 +320,12 @@
         else:
             inst_kwargs = {}
         inst = fclass(**inst_kwargs)
-        kwargs = {}     
+        kwargs = {}   
+        (new_hash, new_timestamp) = (None, None)          
         try:
             (new_hash, new_timestamp) = inst.run(tid, prev_hash, prev_timestamp, **kwargs)            
-        except Exception, e:
-            _logger.exception("Failed task id %r: %s", tid, e)
-            (new_hash, new_timestamp) = (None, None)
+        except:
+            _logger.exception("Failed task id %r: %s", tid)
         if new_hash is not None:
             resultqueue.put((taskid, new_hash, new_timestamp))
         else: