extras-buildsys/www builders.psp,1.5,1.6 job.psp,1.8,1.9

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	builders.psp job.psp 
Log Message:
2005-08-07  Dan Williams <dcbw at redhat.com>

    Play nicely when running more than one builder instance on the same
    machine.

    * builder/builder.py
        - Try to delete actual mock work dir rather than just the buildroot

    * client/client.py
        - Prettier printing of job detail command output
        - Show builder port numbers

    * server/ArchJob.py
        - Save builder port number

    * server/BuildMaster.py
        - Add a builder port # to the archjobs table, and save builder port #
            when writing archjob status to the DB

    * server/Builder.py
        - (to_dict): return builder port # too

    * server/BuilderManager.py
        - Don't exit when adding new builders that have wrong connection
            protocol, just ignore them

    * server/UserInterface.py
        - Retrieve and return builder port numbers too

    * www/builders.psp
        - Differentiate builders and their jobs by port #
        - Only show building archjobs, not 'downloading' or 'downloaded' ones

    * www/job.psp
        - Show builder port numbers




Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- builders.psp	4 Aug 2005 20:27:12 -0000	1.5
+++ builders.psp	8 Aug 2005 02:54:16 -0000	1.6
@@ -32,11 +32,6 @@
 <%
 else:
     for builder in builders:
-        import urllib
-        type, rest = urllib.splittype(builder['address'])
-        addr, port = urllib.splitport(rest)
-        addr = addr[2:]
-
         arch_list = ""
         for arch in builder['arches']:
             arch_list = arch_list + arch
@@ -54,7 +49,7 @@
         <tr>
             <td class="builderaddr-side"></td>
             <td class="builderaddr" align="left">
-                <font class="builderaddr" <%=unavail_color%>><%=addr%>&nbsp;&nbsp;(<%=builder['status']%>)<br>
+                <font class="builderaddr" <%=unavail_color%>><%=builder['address']%>:<%=builder['port']%>&nbsp;&nbsp;(<%=builder['status']%>)<br>
                 <font class="builderarches"><%=arch_list%></font>
             </td>
             <td class="builderaddr-side"></td>
@@ -62,11 +57,13 @@
 <%
         bjob = None
         for job in jobs:
-            archjobs = job['archjobs']
-            if not archjobs:
+            if not job['archjobs']:
                 continue
-            for aj in archjobs:
-                if aj['builder_addr'] == addr:
+            for aj in job['archjobs']:
+                # Only show actually building archjobs
+                if aj['status'] == 'downloading' or aj['status'] == 'downloaded':
+                    continue
+                if aj['builder_addr'] == builder['address'] and aj['builder_port'] == builder['port']:
                     joblink = job_link(job['uid'])
                     if aj['status'] != 'done':
 %>


Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- job.psp	6 Aug 2005 16:25:05 -0000	1.8
+++ job.psp	8 Aug 2005 02:54:16 -0000	1.9
@@ -91,7 +91,7 @@
                     <tr>
                         <td width="2%" class="archjobs"></td>
                         <td width="5%" class="archjobs" align="right"><font class="archjobtag"><%=aj['arch']%>:</font></td>
-                        <td width="33%" class="archjobs" align="left"><font class="archjob">&nbsp;<%=aj['builder_addr']%></font></td>
+                        <td width="33%" class="archjobs" align="left"><font class="archjob"><%=aj['builder_addr']%>:<%=aj['builder_port']%></font></td>
                         <td width="30%" class="archjobs">
                             <font class="archjobtag">Status:</font>
                             <font class="archjob">&nbsp;<%=aj['status']%>/<%=aj['builder_status']%></font>