extras-buildsys/server ArchJob.py,1.16.2.4,1.16.2.5

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
      Tag: STABLE_0_4
	ArchJob.py 
Log Message:
2005-11-18  Dan Williams  <dcbw at redhat.com>

    * server/ArchJob.py
        - Log failed downloads before retrying
        - Retry downloads from builder up to 5 times, not 3

    * builder/builder.py
        - Retry downloads from server up to 5 times, not 3




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -r1.16.2.4 -r1.16.2.5
--- ArchJob.py	15 Nov 2005 05:22:04 -0000	1.16.2.4
+++ ArchJob.py	18 Nov 2005 15:08:20 -0000	1.16.2.5
@@ -185,10 +185,12 @@
         if status == 'done':
             dl_dict[DL_STATUS] = STATUS_DONE
         elif status == 'failed':
-            # Retry the download up to 3 times, then fail it
-            if dl_dict[DL_RETRIES] >= 3:
+            # Retry the download up to 5 times, then fail it
+            if dl_dict[DL_RETRIES] >= 5:
                 dl_dict[DL_STATUS] = STATUS_ERROR
             else:
+                print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid,
+                        self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES])
                 dl_dict[DL_STATUS] = STATUS_WAITING
                 dl_dict[DL_WAIT_TIME] = 5  # Wait a bit before trying again
                 dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1