From fad4f0016f072365605d58a29f1a0b07ad18fe5c Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 17 May 2013 13:17:59 -0500 Subject: SSLServer: Handle socket timeouts gracefully Signed-off-by: Sol Jerome --- src/lib/Bcfg2/SSLServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/SSLServer.py') diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py index 141bd1282..84cd9edcb 100644 --- a/src/lib/Bcfg2/SSLServer.py +++ b/src/lib/Bcfg2/SSLServer.py @@ -281,7 +281,10 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): raise except socket.error: err = sys.exc_info()[1] - if err[0] == 32: + if isinstance(err, socket.timeout): + self.logger.warning("Connection timed out for %s" % + self.client_address[0]) + elif err[0] == 32: self.logger.warning("Connection dropped from %s" % self.client_address[0]) elif err[0] == 104: -- cgit v1.2.3-1-g7c22