Changeset 9d3e646 for fedd

Timestamp:

Dec 3, 2008 9:41:58 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

375ca67

Parents:

46a0f7a

Message:

Differentiate between a failure to connect to a service and the service being
provided using an unexpected protocol. Deal with the internal connection error
more cleanly when the connection is being made to an internal service. That
is, when an internal service is down, propagate a clean error out to the
caller. Before this change, the internal service failure would look like a
protocol error on the external service (SOAP being provided by XMLRPC, for
example) and try the other protocol, which would fail with a misleading error.

Location:

fedd

Files:

• fedd_types.xsd (modified) (1 diff)
• federation/allocate_project.py (modified) (1 diff)
• federation/remote_service.py (modified) (2 diffs)
• federation/service_error.py (modified) (2 diffs)

fedd/fedd_types.xsd

@@ -638 +638 @@
           <xsd:enumeration value="6"/>  <!-- partial instantiation -->
           <xsd:enumeration value="7"/>  <!-- federant error -->
+          <xsd:enumeration value="8"/>  <!-- connect error -->
         </xsd:restriction>
       </xsd:element>

fedd/federation/allocate_project.py

@@ -499 +499 @@
                 req = req[self.request_body_name]
             else:
-                print "request error"
                 raise service_error(service_error.req, "Bad formated request");
 
-            r = self.call_service(self.url, req, self.cert_file, self.cert_pwd,
-                    self.trusted_certs)
+            try:
+                r = self.call_service(self.url, req, self.cert_file,
+                        self.cert_pwd, self.trusted_certs)
+            except service_error, e:
+                if e.code == service_error.connect:
+                    raise service_error(service_error.internal, 
+                            "Cannot connect to internal service: (%d) %s" % \
+                                    (e.code, e.desc))
+                else: raise
             if r.has_key(self.resp_name):
                 return r[self.resp_name]
             else:
-                print "response error"
                 raise service_error(service_error.protocol, 
                         "Bad proxy response")

fedd/federation/remote_service.py

@@ -346 +346 @@
                     { self.request_body_name: r}, self.encap_fedids))
         except socket_error, e:
-            raise service_error(service_error.protocol, 
+            raise service_error(service_error.connect, 
                     "Cannot connect to %s: %s" % (url, e[1]))
         except SSLError, e:
-            raise service_error(service_error.protocol,
+            raise service_error(service_error.connect,
                     "SSL error contacting %s: %s" % (url, e.message))
         except Fault, f:
@@ -407 +407 @@
             resp = remote_method(msg)
         except socket_error, e:
-            raise service_error(service_error.protocol, 
+            raise service_error(service_error.connect, 
                     "Cannot connect to %s: %s" % (url, e[1]))
         except SSLError, e:
-            raise service_error(service_error.protocol,
+            raise service_error(service_error.connect,
                     "SSL error contacting %s: %s" % (url, e.message))
         except ParseException, e:

fedd/federation/service_error.py

@@ -12 +12 @@
     partial = 6
     federant = 7
+    connect = 8
     code_str = { 
         access : "Access Denied",
@@ -18 +19 @@
         server_config: "Server Configuration Error",
         internal : "Internal Error",
-        partial: "Partial embedding",
-        federant: "Federant error"
+        partial: "Partial Embedding",
+        federant: "Federant Error",
+        connect: "Connection Error",
     }
     str_code = dict([ (v, k) for k, v in code_str.iteritems() ])
-    client_errors = ( req )
-    server_errors = ( access, protocol, server_config, internal)
+    client_errors = ( req, partial)
+    server_errors = ( access, protocol, server_config, internal,
+            federant, connect)
 
     def __init__(self, code=None, desc=None, from_string=None):