Changeset bdf00d5

Timestamp:

Mar 18, 2010 11:37:21 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

cd06678

Parents:

114d24b

Message:

Communicate the last error

File:

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

fedd/federation/remote_service.py

@@ -443 +443 @@
         while not ok and retries < self.max_retries:
             try:
+                fail_exc = None
                 resp = remote_method(msg)
                 ok = True
@@ -451 +452 @@
                 if self.log:
                     self.log.warn("BIO error contacting %s: %s" % (url, e))
+                fail_exc = e
                 retries += 1
             except SSLError, e:
                 if self.log:
                     self.log.warn("SSL error contacting %s: %s" % (url, e))
+                fail_exc = e
                 retries += 1
             except httplib.HTTPException, e:
                 if self.log:
                     self.log.warn("HTTP error contacting %s: %s" % (url, e))
+                fail_exc = e
                 retries +=1
             except ParseException, e:
@@ -472 +476 @@
                             "Unexpected fault body")
 
-        if retries >= self.max_retries :
-            raise service_error(service_error.connect, "Too many SSL failures")
+        if retries >= self.max_retries and fail_exc and not ok:
+            raise service_error(service_error.connect, 
+                    "Too many failures: %s" % fail_exc)
 
         # Unpack and convert fedids to objects