extras-buildsys/builder Builder.py,1.4,1.5 BuilderMock.py,1.3,1.4

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	Builder.py BuilderMock.py 
Log Message:
2006-05-09  Dan Williams  <dcbw at redhat.com>

    * builder/Builder.py
        - (upload_files): fix extraction of server address, and pass
            the jobid to the server so it knows what the result files
            are for

    * builder/BuilderMock.py
        - Fix name of ul_callback()

    * common/FileTransfer.py
        - Trap operational errors

    * server/ArchJob.py
        - (get_upload_dir): new function; return the directory into
            which result files should be written

    * server/Builder.py
        - (get_archjob): new function; return archjob object for a
            particular jobid
        - (_handle_building_jobs): correct scoping of bits that get
            status for certain jobs
        - Increase the required active builder contact interval slightly
        - (request): reset the unavailable count every time the builder
            contacts us

    * server/BuilderManager.py
        - (__init__): Enable the HTTP POST handler when there are
            active builders
        - (upload_callback): handle incoming files by writing them
            to the correct location based on their jobid




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Builder.py	9 May 2006 02:57:11 -0000	1.4
+++ Builder.py	9 May 2006 06:04:48 -0000	1.5
@@ -431,16 +431,17 @@
         downloader.start()
         return downloader
 
-    def upload_files(self, files, ul_callback, cb_data=None):
+    def upload_files(self, archjob_id, files, ul_callback, cb_data=None):
         server = self._cfg.get_str("Active", "server")
         (urltype, urlrest) = urllib.splittype(server)
-        (server, urlrest) = urllib.splithost(urlrest)
+        (ignore, server) = urllib.splithost(urlrest)
         if self._cfg.get_bool("SSL", "use_ssl"):
             url = "https://" + server
         else:
             url = "http://" + server
         url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port")
-        uploader = FileUploader.FileUploader(url, files, 'filedata', None,
+        data = [("archjob_id", archjob_id)]
+        uploader = FileUploader.FileUploader(url, files, 'filedata', data,
                 self._certs)
         uploader.set_callback(ul_callback, cb_data)
         uploader.start()


Index: BuilderMock.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BuilderMock.py	9 May 2006 02:57:11 -0000	1.3
+++ BuilderMock.py	9 May 2006 06:04:48 -0000	1.4
@@ -408,10 +408,11 @@
 
         self._copy_mock_output_to_log()
         self._files = self._find_files()
-        self._uploader = self._controller.upload_files(self._files, self.ul_callback, None)
+        self._uploader = self._controller.upload_files(self._uniqid, self._files,
+                self.ul_callback, None)
         self._status = "uploading"
 
-    def _ul_callback(self, status, cb_data, msg):
+    def ul_callback(self, status, cb_data, msg):
         if status == FileTransfer.FT_RESULT_SUCCESS:
             pass
         elif status == FileTransfer.FT_RESULT_FAILED: