r5440 - trunk/wooly/python/wooly

tmckay at fedoraproject.org tmckay at fedoraproject.org
Thu Aug 2 15:57:24 UTC 2012


Author: tmckay
Date: 2012-08-02 15:57:23 +0000 (Thu, 02 Aug 2012)
New Revision: 5440

Modified:
   trunk/wooly/python/wooly/server.py
Log:
Add handler for OpenSSL.SSL.Error


Modified: trunk/wooly/python/wooly/server.py
===================================================================
--- trunk/wooly/python/wooly/server.py	2012-08-02 15:23:50 UTC (rev 5439)
+++ trunk/wooly/python/wooly/server.py	2012-08-02 15:57:23 UTC (rev 5440)
@@ -261,8 +261,15 @@
                 pass
 
         try:
+            from OpenSSL import SSL
+        except:
+            class SSL(object):
+                class Error(Exception):
+                    pass
+
+        try:
             self.wsgi_server.start()
-        except SSLError, e:
+        except (SSLError, SSL.Error), e:
             log.error("Web server is shutting down from an unhandled SSLError" \
                       " (problem with the key or certificate?): %s" % e)
             self.wsgi_server.stop()



More information about the cumin-developers mailing list