summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-08-29 08:38:45 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-08-29 08:38:45 -0400
commit01d7c89326cabe4a45ff99accba395eeed89f9c4 (patch)
treee7a0e0ca11deeeba2b83b314605b155d84d60f80 /src/lib
parent47dccf125c42e1b888ef4b7800406d975be1b285 (diff)
downloadbcfg2-01d7c89326cabe4a45ff99accba395eeed89f9c4.tar.gz
bcfg2-01d7c89326cabe4a45ff99accba395eeed89f9c4.tar.bz2
bcfg2-01d7c89326cabe4a45ff99accba395eeed89f9c4.zip
SSLServer: close connections properly
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Bcfg2/SSLServer.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py
index 2107f8abb..cee42e618 100644
--- a/src/lib/Bcfg2/SSLServer.py
+++ b/src/lib/Bcfg2/SSLServer.py
@@ -305,14 +305,11 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
def finish(self):
# shut down the connection
- if not self.wfile.closed:
- try:
- self.wfile.flush()
- self.wfile.close()
- except socket.error:
- err = sys.exc_info()[1]
- self.logger.warning("Error closing connection: %s" % err)
- self.rfile.close()
+ try:
+ SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.finish(self)
+ except socket.error:
+ err = sys.exc_info()[1]
+ self.logger.warning("Error closing connection: %s" % err)
class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,