From 28f2ca52c6977ea6ebf024254e48c66412c9ffb4 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Wed, 11 Aug 2010 14:53:28 +0000
Subject: SSLServer: handle socket errors on shutdown gracefully (Resolves #907
 and #909)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6011 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/SSLServer.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index ed8e5e405..7c5b76664 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -139,8 +139,14 @@ class SSLServer (SocketServer.TCPServer, object):
         return sslsock, sockinfo
 
     def close_request(self, request):
-        request.unwrap()
-        request.close()
+        try:
+            request.unwrap()
+        except:
+            pass
+        try:
+            request.close()
+        except:
+            pass
 
     def _get_url(self):
         port = self.socket.getsockname()[1]
-- 
cgit v1.2.3-1-g7c22