extras-buildsys/server Builder.py,1.22,1.23

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * client/client.py
      server/Builder.py
      www/template/main.psp
        - Use timeouts for XMLRPC clients

2005-11-24  Dan Williams  <dcbw at redhat.com>

    * common/AuthedXMLRPMServer.py
      common/SSLCommon.py
      common/SSLConnection.py
      common/XMLRPCServerProxy.py
        - Implement socket timeouts for XMLRPC client & server




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Builder.py	15 Nov 2005 18:51:40 -0000	1.22
+++ Builder.py	25 Nov 2005 04:45:12 -0000	1.23
@@ -58,14 +58,14 @@
         self._server_cfg = cfg
 
         certs = {}
-        certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert")
-        certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
-        certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
-
         if self._server_cfg.get_bool("Builders", "use_ssl"):
-            self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
+            certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert")
+            certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
+            certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
         else:
-            self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None)
+            certs = None
+
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
         (self._alive, target_list) = self._ping_builder()