diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-05-17 13:17:59 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-05-17 13:17:59 -0500 |
| commit | fad4f0016f072365605d58a29f1a0b07ad18fe5c (patch) | |
| tree | c40d41d17ccaa4bfc997e7a162e928463e2efc19 | |
| parent | c92acd93d23c27914c63295dc3396382b9db756d (diff) | |
| download | bcfg2-fad4f0016f072365605d58a29f1a0b07ad18fe5c.tar.gz bcfg2-fad4f0016f072365605d58a29f1a0b07ad18fe5c.tar.bz2 bcfg2-fad4f0016f072365605d58a29f1a0b07ad18fe5c.zip | |
SSLServer: Handle socket timeouts gracefully
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/Bcfg2/SSLServer.py | 5 |
1 files changed, 4 insertions, 1 deletions
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: |