summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2011-01-24 13:09:26 -0600
committerTim Laszlo <tim.laszlo@gmail.com>2011-01-24 13:10:14 -0600
commit8394f59acd639f4a89c8010590819c773b1b803e (patch)
tree6fa29b64f209b9ad13e9cc85ca09ce899a1b41bc /src
parentd656849aafeabcf9f92ce8068ccd404832f61735 (diff)
downloadbcfg2-8394f59acd639f4a89c8010590819c773b1b803e.tar.gz
bcfg2-8394f59acd639f4a89c8010590819c773b1b803e.tar.bz2
bcfg2-8394f59acd639f4a89c8010590819c773b1b803e.zip
SSLServer: Stop raising trapped exceptions from XMLRPCRequestHandler. Causes the server to wedge. (Resolves #970)
Diffstat (limited to 'src')
-rw-r--r--src/lib/SSLServer.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index 7c5b76664..1f4c1c8e4 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -262,10 +262,12 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
self.logger.warning("Connection dropped from %s" % self.client_address[0])
elif str(type) == 'socket.error' and msg[0] == 104:
self.logger.warning("Connection reset by peer: %s" % self.client_address[0])
+ elif str(type) == 'ssl.SSLError':
+ self.logger.warning("SSLError handling client %s: %s" % \
+ (self.client_address[0], msg))
else:
self.logger.error("Error sending response (%s): %s" % \
(type, msg))
- raise
def finish(self):
# shut down the connection