From ad4bc6e79d986b019d7d6a29ce864b792da5d658 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Wed, 21 Mar 2007 14:50:01 +0000
Subject: Improve error handling for ssl handshakes

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

diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py
index 7e3b9c724..5aebbcbdc 100644
--- a/src/lib/Server/Component.py
+++ b/src/lib/Server/Component.py
@@ -71,12 +71,10 @@ class TLSServer(Bcfg2.tlslite.api.TLSSocketServerMixIn,
                                           sessionCache=self.sc)
             tlsConnection.ignoreAbruptClose = True
             return True
-        except Bcfg2.tlslite.errors.TLSError, socket.error:
-            print "Handshake failure:", str(error)
+        except Bcfg2.tlslite.errors.TLSError, error:
+            return False
+        except socket.error:
             return False
-        except Exception, e:
-            print "got", e
-            raise
                 
 class Component(TLSServer,
                 SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
-- 
cgit v1.2.3-1-g7c22