Changeset 1b57352

Timestamp:

Nov 28, 2008 4:04:25 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

0a20ef8

Parents:

a2da110

Message:

Deal with common connection and SSL errors cleanly

Location:

fedd

Files:

• fedd.py (modified) (1 diff)
• remote_service.py (modified) (3 diffs)

fedd/fedd.py

@@ -91 +91 @@
         self.xmlrpc_methods = impl.xmlrpc_services
         self.log = logging.getLogger("fedd")
+
+    def handle_error(self, request, address):
+        """
+        The default SSLServer prints a stack trace here.  This is a little
+        friendlier.
+        """
+        if request or address:
+            self.log.warn("[fedd] Error on incoming connection: %s %s" % \
+                    (request, address))
+        else:
+            self.log.warn("[fedd] Error on incoming connection " + \
+                    "(Likely SSL error)")
 
 class fedd_soap_handler(BaseHTTPRequestHandler):

fedd/remote_service.py

@@ -2 +2 @@
 
 import copy
+
+from socket import error as socket_error
 
 import M2Crypto.httpslib
 from M2Crypto.m2xmlrpclib import SSL_Transport
+from M2Crypto.SSL import SSLError
 from ZSI import ParseException, FaultException, SoapWriter
 
@@ -290 +293 @@
             resp = remote_method(self.apply_to_tags(\
                     { self.request_body_name: r}, self.encap_fedids))
+        except socket_error, e:
+            raise service_error(service_error.protocol, 
+                    "Cannot connect to %s: %s" % (url, e[1]))
+        except SSLError, e:
+            raise service_error(service_error.protocol,
+                    "SSL error contacting %s: %s" % (url, e.message))
         except Fault, f:
             raise service_error(None, f.faultString, f.faultCode)
@@ -345 +354 @@
         try:
             resp = remote_method(msg)
+        except socket_error, e:
+            raise service_error(service_error.protocol, 
+                    "Cannot connect to %s: %s" % (url, e[1]))
+        except SSLError, e:
+            raise service_error(service_error.protocol,
+                    "SSL error contacting %s: %s" % (url, e.message))
         except ParseException, e:
             raise service_error(service_error.protocol,