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

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	builder.py 
Log Message:
2005-07-22  Dan Williams <dcbw at redhat.com>

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- builder.py	22 Jul 2005 05:39:13 -0000	1.24
+++ builder.py	22 Jul 2005 21:35:26 -0000	1.25
@@ -104,7 +104,7 @@
     def die(self, sig=15):
         # Do nothing if we've already been killed
         if self._done_status == 'killed':
-            return
+            return True
 
         self.log("Killing build process...\n")
         # Don't try to kill a running cleanup process
@@ -754,9 +754,9 @@
             xmlserver.handle_request()
         except KeyboardInterrupt, e:
             print "Shutting down..."
-            curjob = xmlserver.get_cur_job()
+            (curjob, status) = bcs.get_cur_job()
             if curjob:
-                xmlserver.die(curjob)
+                bcs.die(curjob)
             break
 
         cur_time = time.time()