Changeset e252e5d for fedd/federation/emulab_segment.py

Timestamp:

Sep 9, 2011 1:59:08 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

a3bbb4a

Parents:

f585453 (diff), 355b17e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'axis_example'

File:

• fedd/federation/emulab_segment.py (modified) (1 diff)

fedd/federation/emulab_segment.py

@@ -45 +45 @@
         except socket_error, e:
             raise service_error(service_error.connect, 
-                    "Cannot connect to %s: %s" % (url, e[1]))
+                    "Cannot connect" % e)
             raise e
         except BIOError, e:
             if self.log:
-                self.log.warn("BIO error contacting %s: %s" % (url, e))
+                self.log.warn("BIO error: %s" % e)
             raise e
         except sslerror, e:
             if self.log:
-                self.log.warn("SSL (socket) error contacting %s: %s" % 
-                        (url, e))
+                self.log.warn("SSL (socket) error: %s" %  e)
             raise e
         except SSLError, e:
             if self.log:
-                self.log.warn("SSL error contacting %s: %s" % (url, e))
+                self.log.warn("SSL error: %s" % e)
             raise e
         except httplib.HTTPException, e:
             if self.log:
-                self.log.warn("HTTP error contacting %s: %s" % (url, e))
+                self.log.warn("HTTP error: %s" % e)
             raise e
         except Fault, f:
-            raise service_error(f.faultCode, f.faultString)
+            raise service_error(service_error.protocol, 
+                    "Remote XMLRPC Fault: %s" % f)
         except Error, e:
             raise service_error(service_error.protocol,