extras-buildsys/server Builder.py,1.8,1.9

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * common/AuthedXMLRPCServer.py
      common/SSLConnection.py
      server/Builder.py
        - Simulate socket timeouts with select()




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Builder.py	20 Jul 2005 20:50:07 -0000	1.8
+++ Builder.py	2 Aug 2005 00:58:16 -0000	1.9
@@ -124,7 +124,7 @@
         self._server_lock.acquire()
         try:
             jobid = self._server.start(target, arch, srpm_url)
-        except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
             jobid = 0
         self._server_lock.release()
         builder_xmlrpc_lock.release()
@@ -146,7 +146,7 @@
         self._server_lock.acquire()
         try:
             (jobid, status) = self._server.get_cur_job()
-        except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError):
             self._unavail_count = self._unavail_count + 1
         else:
             self._unavail_count = 0