Changeset 8e6fe4d for fedd/federation/remote_service.py

Timestamp:

Mar 5, 2010 4:58:48 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c5b28bf

Parents:

444790d

Message:

checkpoint and SLSL error catching

File:

• fedd/federation/remote_service.py (modified) (3 diffs)

fedd/federation/remote_service.py

@@ -298 +298 @@
         self.tracefile = tracefile
         self.__call__ = self.call_service
+        self.max_retries = 5
 
     def serialize_soap(self, req):
@@ -343 +344 @@
         port = ServerProxy(url, transport=transport)
         # Make the call, and convert faults back to service_errors
-        try:
-            remote_method = getattr(port, self.service_name, None)
-            if self.request_body_name:
-                resp = remote_method(self.apply_to_tags(\
-                        { self.request_body_name: r}, self.encap_fedids))
-            else:
-                resp = remote_method(self.apply_to_tags(r, self.encap_fedids))
-        except socket_error, e:
-            raise service_error(service_error.connect, 
-                    "Cannot connect to %s: %s" % (url, e[1]))
-        except SSLError, e:
-            raise service_error(service_error.connect,
-                    "SSL error contacting %s: %s" % (url, e.message))
-        except Fault, f:
-            raise service_error(f.faultCode, f.faultString)
-        except Error, e:
-            raise service_error(service_error.protocol, 
-                    "Remote XMLRPC Fault: %s" % e)
+        if self.request_body_name:
+            r  = self.apply_to_tags(\
+                    { self.request_body_name: r}, self.encap_fedids)
+        else:
+            r = self.apply_to_tags(r, self.encap_fedids)
+
+        ok = False
+        retries = 0
+
+        while not ok and retries < self.max_retries:
+            try:
+                remote_method = getattr(port, self.service_name, None)
+                resp = remote_method(r)
+            except socket_error, e:
+                raise service_error(service_error.connect, 
+                        "Cannot connect to %s: %s" % (url, e[1]))
+            except SSLError, e:
+                print "SSL error contacting %s: %s" % (url, e.message)
+                retries += 1
+            except Fault, f:
+                raise service_error(f.faultCode, f.faultString)
+            except Error, e:
+                raise service_error(service_error.protocol, 
+                        "Remote XMLRPC Fault: %s" % e)
+
+        if retries > self.max_retries :
+            raise service_error(req.connect, "Too many SSL failures")
 
         return self.apply_to_tags(resp, self.decap_fedids) 
@@ -413 +423 @@
                             self.request_body_name)
         set_element(self.pack_soap(msg, self.request_body_name, req))
-        try:
-            resp = remote_method(msg)
-        except socket_error, e:
-            raise service_error(service_error.connect, 
-                    "Cannot connect to %s: %s" % (url, e[1]))
-        except SSLError, e:
-            raise service_error(service_error.connect,
-                    "SSL error contacting %s: %s" % (url, e.message))
-        except ParseException, e:
-            raise service_error(service_error.protocol,
-                    "Bad format message (XMLRPC??): %s" % e)
-        except FaultException, e:
-            ee = self.unpack_soap(e.fault.detail[0]).get('FeddFaultBody', { })
-            if ee:
-                raise service_error(ee['code'], ee['desc'])
-            else:
-                raise service_error(service_error.internal,
-                        "Unexpected fault body")
+        ok = False
+        retries = 0
+        while not ok and retries < self.max_retries:
+            try:
+                resp = remote_method(msg)
+                ok = True
+            except socket_error, e:
+                raise service_error(service_error.connect, 
+                        "Cannot connect to %s: %s" % (url, e[1]))
+            except SSLError, e:
+                print "SSL error contacting %s: %s" % (url, e.message)
+                retries += 1
+            except ParseException, e:
+                raise service_error(service_error.protocol,
+                        "Bad format message (XMLRPC??): %s" % e)
+            except FaultException, e:
+                ee = self.unpack_soap(e.fault.detail[0]).get('FeddFaultBody',
+                        { })
+                if ee:
+                    raise service_error(ee['code'], ee['desc'])
+                else:
+                    raise service_error(service_error.internal,
+                            "Unexpected fault body")
+
+        if retries > self.max_retries :
+            raise service_error(req.connect, "Too many SSL failures")
+
         # Unpack and convert fedids to objects
         r = self.apply_to_tags(self.unpack_soap(resp), self.fedid_to_object)
+
         #  Make sure all strings are unicode
         r = self.make_unicode(r)