pld-builder.new: PLD_Builder/request.py, PLD_Builder/request_handler.py - a...

[sparky]

Author: sparky                       Date: Wed Oct 28 15:34:29 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- add time information to builder status

---- Files affected:
pld-builder.new/PLD_Builder:
   request.py (1.68 -> 1.69) , request_handler.py (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.68 pld-builder.new/PLD_Builder/request.py:1.69
--- pld-builder.new/PLD_Builder/request.py:1.68	Wed Jul 15 15:00:33 2009
+++ pld-builder.new/PLD_Builder/request.py	Wed Oct 28 16:34:24 2009
@@ -129,6 +129,7 @@
         self.bconds_without = []
         self.builders = []
         self.builders_status = {}
+        self.builders_status_time = {}
         self.kernel = ""
         self.target = []
         self.branch = ""
@@ -166,6 +167,7 @@
             elif c.nodeName == "builder":
                 self.builders.append(text(c))
                 self.builders_status[text(c)] = attr(c, "status", "?")
+                self.builders_status_time[text(c)] = attr(c, "time", "0")
             elif c.nodeName == "with":
                 self.bconds_with.append(text(c))
             elif c.nodeName == "without":
@@ -281,8 +283,8 @@
         for b in self.bconds_without:
             f.write("           <without>%s</without>\n" % escape(b))
         for b in self.builders:
-            f.write("           <builder status='%s'>%s</builder>\n" % \
-                                                (escape(self.builders_status[b]), escape(b)))
+            f.write("           <builder status='%s' time='%s'>%s</builder>\n" % \
+                    (escape(self.builders_status[b]), self.builders_status_time[b], escape(b)))
         f.write("         </batch>\n")
         
     def log_line(self, l):
@@ -329,6 +331,7 @@
                 for b in r.batches:
                     if self.batches.has_key(b.b_id):
                         b.builders_status[self.builder] = self.batches[b.b_id]
+                        b.builders_status_time[self.builder] = time.time()
 
 def build_request(e):
     if e.nodeType != Element.ELEMENT_NODE:

================================================================
Index: pld-builder.new/PLD_Builder/request_handler.py
diff -u pld-builder.new/PLD_Builder/request_handler.py:1.48 pld-builder.new/PLD_Builder/request_handler.py:1.49
--- pld-builder.new/PLD_Builder/request_handler.py:1.48	Sun Aug 16 15:44:38 2009
+++ pld-builder.new/PLD_Builder/request_handler.py	Wed Oct 28 16:34:24 2009
@@ -85,6 +85,7 @@
 
         for bld in batch.builders:
             batch.builders_status[bld] = '?'
+            batch.builders_status_time[bld] = time.time()
             if bld not in config.binary_builders and bld != config.builder:
                 fail_mail("I (src rpm builder '%s') do not handle binary builder '%s', only '%s'" % \
                         (config.builder, bld, string.join(config.binary_builders)))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request.py?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_handler.py?r1=1.48&r2=1.49&f=u