extras-buildsys/server Builder.py,1.20.2.2,1.20.2.3
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Nov 24 22:39:06 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20845/server
Modified Files:
Tag: STABLE_0_4
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
Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- Builder.py 15 Nov 2005 18:56:22 -0000 1.20.2.2
+++ Builder.py 24 Nov 2005 22:39:04 -0000 1.20.2.3
@@ -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()
More information about the fedora-extras-commits
mailing list