Changeset c2c153b

Timestamp:

Mar 8, 2010 6:53:11 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

9b3627e

Parents:

0b799e0

Message:

another place SSL/HTTP can bedevil us

File:

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

fedd/federation/remote_service.py

@@ -10 +10 @@
 from M2Crypto.SSL import SSLError
 from ZSI import ParseException, FaultException, SoapWriter
+
+# Underlying SOAP comms use this and we need to catch their exceptions
+import httplib
 
 from service_error import service_error
@@ -364 +367 @@
                 print "SSL error contacting %s: %s" % (url, e.message)
                 retries += 1
+            except httplib.HTTPException, e:
+                print "HTTP error contacting %s: %s" % (url, e.message)
+                retries +=1
             except Fault, f:
                 raise service_error(f.faultCode, f.faultString)
@@ -436 +442 @@
                 print "SSL error contacting %s: %s" % (url, e.message)
                 retries += 1
+            except httplib.HTTPException, e:
+                print "HTTP error contacting %s: %s" % (url, e.message)
+                retries +=1
             except ParseException, e:
                 raise service_error(service_error.protocol,