Author: tmckay
Date: 2012-10-29 19:42:58 +0000 (Mon, 29 Oct 2012)
New Revision: 5526
Modified:
trunk/wooly/python/wooly/server.py
Log:
Loosen test for SSL errors and suppress them all, include a debug level log msg
BZ842286 (modified)
Modified: trunk/wooly/python/wooly/server.py
===================================================================
--- trunk/wooly/python/wooly/server.py 2012-10-29 18:12:26 UTC (rev 5525)
+++ trunk/wooly/python/wooly/server.py 2012-10-29 19:42:58 UTC (rev 5526)
@@ -19,9 +19,10 @@
try:
s, env = super(PatchBuiltinSSLAdapter, self).wrap(sock)
except ssl.SSLError, e:
- if e.errno != ssl.SSL_ERROR_SSL or \
- not e.args[1].endswith('alert unknown ca'):
+ if e.errno != ssl.SSL_ERROR_SSL:
raise
+ else:
+ log.debug("Supressing ssl exception", exc_info=True)
s, env = None, {}
return s, env
except:
Show replies by thread