pld-builder.new: PLD_Builder/rpm_builder.py - fail on builds that hang long...

[arekm]

Author: arekm                        Date: Mon Aug 17 10:04:53 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- fail on builds that hang longer than 6 hours

---- Files affected:
pld-builder.new/PLD_Builder:
   rpm_builder.py (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.101 pld-builder.new/PLD_Builder/rpm_builder.py:1.102
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.101	Wed Jul 15 17:28:35 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Mon Aug 17 12:04:47 2009
@@ -85,7 +85,14 @@
             # fail in a way where cron job will retry
             msg = "unable to fetch file, http code: %d" % error.code
             b.log_line(msg)
-            raise IOError, msg
+            queue_time = time.time() - r.time
+            # 6 hours
+            if queue_time > 0 && < (6 * 60 * 60):
+                raise IOError, msg
+            else:
+                msg = "too long in queue, failing"
+                b.log_line(msg)
+                return False
         except urllib2.URLError, error:
             # see errno.h
             if error.errno in [-3, 60, 61, 110, 111]:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.101&r2=1.102&f=u