[NEW PATCH] Replace m2crypto: re-add timeout (via gerrit-bot)

Dan Kenigsberg danken at redhat.com
Mon Aug 8 13:41:20 UTC 2011


New patch submitted by Dan Kenigsberg (danken at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/798

commit 5cb72b83b3bfd2399689e5f885320462872c630e
Author: Dan Kenigsberg <danken at redhat.com>
Date:   Wed Feb 16 16:16:02 2011 +0200

    Replace m2crypto: re-add timeout
    
    Change-Id: I8003bfc7eba33de53588acc8a2925bcbcea69fe0

diff --git a/vdsm/SecureXMLRPCServer.py b/vdsm/SecureXMLRPCServer.py
index 3fbecc8..b544741 100644
--- a/vdsm/SecureXMLRPCServer.py
+++ b/vdsm/SecureXMLRPCServer.py
@@ -61,7 +61,8 @@ class SecureXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
                  requestHandler=SimpleXMLRPCServer.SimpleXMLRPCRequestHandler,
                  logRequests=True, allow_none=False, encoding=None,
                  bind_and_activate=True,
-                 keyfile=None, certfile=None, ca_certs=None):
+                 keyfile=None, certfile=None, ca_certs=None,
+                 timeout=None):
         """Initialize a SimpleXMLRPCServer instance but wrap its .socket member with ssl."""
 
         SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, addr,
@@ -73,6 +74,8 @@ class SecureXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
                  ca_certs=ca_certs, server_side=True,
                  cert_reqs=ssl.CERT_REQUIRED,
                  do_handshake_on_connect=False)
+        if timeout is not None:
+            self.socket.settimeout = timeout
         if bind_and_activate:
             self.server_bind()
             self.server_activate()
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index cb6bc8f..21e9ae7 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -200,8 +200,9 @@ class clientIF:
                     return SecureXMLRPCServer.SecureXMLRPCRequestHandler.setup(self)
             KEYFILE, CERTFILE, CACERT = self.getKeyCertFilenames()
             s = SecureXMLRPCServer.SecureThreadedXMLRPCServer(server_address,
-                        KEYFILE, CERTFILE, CACERT,
-#                        timeout=config.getint('vars', 'vds_responsiveness_timeout'),
+                        keyfile=KEYFILE, certfile=CERTFILE, ca_certs=CACERT,
+                        timeout=config.getint('vars',
+                                              'vds_responsiveness_timeout'),
                         requestHandler=LoggingHandler)
             utils.closeOnExec(s.socket.socket.fileno())
         else:




More information about the vdsm-patches mailing list