extras-buildsys/client client.py,1.24,1.25

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11669/client

Modified Files:
	client.py 
Log Message:
2005-08-05  Dan Williams <dcbw at redhat.com>

   * Rework builder tracking code to always keep Builder objects around, and
        to mark them as active/unavailable rather than dropping unavailable
        builders.  Unavailable builders are pinged every 5 minutes to see if
        they are alive or not.  Admins can still manually ping builders.

    * Remove lots of locking code in between the Builders, ArchJobs, and the
        BuildMaster since it was only relevant when pyOpenSSL still sucked.
        Communication with the builder's XMLRPC server only happens from each
        Builder object's thread now.

    * Consolidate job-killing code in both the ArchJob and the PackageJob




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- client.py	5 Aug 2005 16:24:07 -0000	1.24
+++ client.py	6 Aug 2005 02:35:06 -0000	1.25
@@ -191,9 +191,9 @@
     print msg
 
 
-def print_builders(banner, builder_list):
-        print "\n%s:" % banner
-        print "-" * 70
+def print_builders(builder_list):
+        print "\nBuilders:"
+        print "-" * 90
         for builder in builder_list:
             string = "  " + builder['address']
             string = string + " " * (40 - len(builder['address']))
@@ -206,16 +206,15 @@
 
 def update_builders(server, email):
     """
-    Tell the build server to requery its builder list and re-add dropped
-    builders that are now alive.
+    Tell the build server to requery its builder list ASAP.
     """
 
     try:
         (e, msg, builder_list) = server.update_builders()
         if len(builder_list) > 0:
-            print_builders("New Builders", builder_list)
+            print_builders(builder_list)
         else:
-            print "No new builders found."
+            print "No builders found."
     except socket.error, e:
         print "Error connecting to build server: '%s'" % e
 
@@ -228,9 +227,9 @@
     try:
         (e, msg, builder_list) = server.list_builders()
         if len(builder_list) > 0:
-            print_builders("Active Builders", builder_list)
+            print_builders(builder_list)
         else:
-            print "No active builders found."
+            print "No builders found."
     except socket.error, e:
         print "Error connecting to build server: '%s'" % e