Changeset 3f5e375

Timestamp:

Apr 6, 2011 2:48:45 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

42dedbd

Parents:

cf9598a

Message:

Error handling

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,