r7490 - dumbhippo/trunk/firehose/firehose/jobs

[commits mugshot org]

Author: walters
Date: 2008-06-25 09:27:28 -0500 (Wed, 25 Jun 2008)
New Revision: 7490

Modified:
   dumbhippo/trunk/firehose/firehose/jobs/poller.py
Log:
Likely fix for firehose hangs

Use the correct number of format args so we don't throw another
exception in our exception handler.


Modified: dumbhippo/trunk/firehose/firehose/jobs/poller.py
===================================================================
--- dumbhippo/trunk/firehose/firehose/jobs/poller.py	2008-06-24 17:06:38 UTC (rev 7489)
+++ dumbhippo/trunk/firehose/firehose/jobs/poller.py	2008-06-25 14:27:28 UTC (rev 7490)
@@ -325,7 +325,7 @@
         try:
             (new_hash, new_timestamp) = inst.run(tid, prev_hash, prev_timestamp, **kwargs)            
         except:
-            _logger.exception("Failed task id %r: %s", tid)
+            _logger.exception("Failed task id %r", tid)
         if new_hash is not None:
             resultqueue.put((taskid, new_hash, new_timestamp))
         else:
@@ -337,6 +337,8 @@
         for (taskid, prev_hash, prev_timestamp) in tasks:
             taskcount += 1
             thread = threading.Thread(target=self.__run_task, args=(taskid, prev_hash, prev_timestamp, resultqueue))
+            thread.setDaemon(True)
             thread.start()
         collector = threading.Thread(target=self.__run_collect_tasks, args=(taskcount,resultqueue,masterhost,serial))
         collector.start()
+        collector.setDaemon(True)