Changeset 0b466d1

Timestamp:

Oct 9, 2008 2:54:54 PM (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:

d199ced

Parents:

0ea11af

Message:

logging

Location:

fedd

Files:

• fedd.py (modified) (3 diffs)
• fedd_access.py (modified) (1 diff)
• fedd_client.py (modified) (2 diffs)
• fedd_deter_impl.py (modified) (1 diff)
• fedd_experiment_control.py (modified) (1 diff)

fedd/fedd.py

@@ -42 +42 @@
         ThreadingSSLServer.__init__(self, ME, handler, ssl_ctx)
         self.impl = impl
-        self.soap_methods = impl.get_soap_services()
-        self.xmlrpc_methods = impl.get_xmlrpc_services()
+        self.soap_methods = impl.soap_services
+        self.xmlrpc_methods = impl.xmlrpc_services
+        self.log = logging.getLogger("fedd")
 
 class fedd_soap_handler(BaseHTTPRequestHandler):
@@ -113 +114 @@
             self.send_xml(str(sw))
 
+    def log_request(self, code=0, size=0):
+        """
+        Log request to the fedd logger
+        """
+        self.server.log.info("Successful SOAP request code %d" % code)
+
     def soap_dispatch(self, method, req, fid):
         """
@@ -181 +188 @@
                 resp = None
         self.send_xml(data)
+
+    def log_request(self, code=0, size=0):
+        """
+        Log request to the fedd logger
+        """
+        self.server.log.info("Successful XMLRPC request code %d" % code)
 
 

fedd/fedd_access.py

@@ -500 +500 @@
                             service_error.proxy,
                             "Undefined fault from proxy??");
-    
-    def get_soap_services(self):
-        return self.soap_services
-
-    def get_xmlrpc_services(self):
-        return self.xmlrpc_services
-

fedd/fedd_client.py

@@ -317 +317 @@
             except Error, e:
                 resp = { 'FeddFaultBody': \
-                        { 'errstr' : e.faultCode, 'desc' : e.faultString } }
+                        { 'errstr' : getattr(e, "faultCode", "No fault code"),
+                        'desc' : getattr(e, "faultString", "No fault string") }\
+                        }
             if resp:
                 if resp.has_key(self.ResponseBody): 
@@ -566 +568 @@
                     {'desc': e.desc, 'errstr': e.errstr, 'code': e.code})
         except RuntimeError, e:
-            sys.exit("Error processing RPC: %s" % e.message)
+            sys.exit("Error processing RPC: %s" % e)
 
         if opts.debug > 1: print >>sys.stderr, resp_dict

fedd/fedd_deter_impl.py

@@ -38 +38 @@
             self.xmlrpc_services.update(self.experiment.xmlrpc_services) 
 
-    def get_soap_services(self):
-        return self.soap_services
-
-    def get_xmlrpc_services(self):
-        return self.xmlrpc_services
-
 def new_feddservice(configfile):
     return fedd_deter_impl(configfile)

fedd/fedd_experiment_control.py

@@ -299 +299 @@
                         "TerminateResponseBody"),
         }
-
-    def get_soap_services(self):
-        return self.soap_services
-
-    def get_xmlrpc_services(self):
-        return self.xmlrpc_services
 
     def copy_file(self, src, dest, size=1024):