diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2011-01-24 13:09:26 -0600 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2011-01-24 13:10:39 -0600 |
| commit | 1c11a83d5ee3a5369aa5cedc7df64db5e558ef1d (patch) | |
| tree | 046e1215daa58bd9bb39166af38e1cf3cfd2c868 | |
| parent | 38fcd5004eb130bcafc5a5ed3fd6913260abb4ef (diff) | |
| download | bcfg2-1c11a83d5ee3a5369aa5cedc7df64db5e558ef1d.tar.gz bcfg2-1c11a83d5ee3a5369aa5cedc7df64db5e558ef1d.tar.bz2 bcfg2-1c11a83d5ee3a5369aa5cedc7df64db5e558ef1d.zip | |
SSLServer: Stop raising trapped exceptions from XMLRPCRequestHandler. Causes the server to wedge. (Resolves #970)
(cherry picked from commit 8394f59acd639f4a89c8010590819c773b1b803e)
| -rw-r--r-- | src/lib/SSLServer.py | 4 |
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 |