Changeset 114d24b

Timestamp:

Mar 18, 2010 8:45:28 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

bdf00d5

Parents:

1dcaff4

Message:

logging

File:

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

fedd/federation/remote_service.py

@@ -274 +274 @@
 class service_caller(remote_service_base):
     def __init__(self, service_name, request_message=None, 
-            request_body_name=None, tracefile=None, strict=True):
+            request_body_name=None, tracefile=None, strict=True,
+            log=None):
         self.service_name = service_name
 
@@ -303 +304 @@
         self.__call__ = self.call_service
         self.max_retries = 5
+        self.log = log
 
     def serialize_soap(self, req):
@@ -366 +368 @@
                         "Cannot connect to %s: %s" % (url, e[1]))
             except BIOError, e:
-                print "BIO error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("BIO error contacting %s: %s" % (url, e))
                 retries += 1
             except SSLError, e:
-                print "SSL error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("SSL error contacting %s: %s" % (url, e))
                 retries += 1
             except httplib.HTTPException, e:
-                print "HTTP error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("HTTP error contacting %s: %s" % (url, e))
                 retries +=1
             except Fault, f:
@@ -444 +449 @@
                         "Cannot connect to %s: %s" % (url, e[1]))
             except BIOError, e:
-                print "BIO error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("BIO error contacting %s: %s" % (url, e))
                 retries += 1
             except SSLError, e:
-                print "SSL error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("SSL error contacting %s: %s" % (url, e))
                 retries += 1
             except httplib.HTTPException, e:
-                print "HTTP error contacting %s: %s" % (url, e.message)
+                if self.log:
+                    self.log.warn("HTTP error contacting %s: %s" % (url, e))
                 retries +=1
             except ParseException, e: