Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Method.py

diff --git a/PLC/Method.py b/PLC/Method.py
index e2250ea..5e7d09a 100644 (file)
--- a/PLC/Method.py
+++ b/PLC/Method.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Method.py,v 1.20 2006/12/20 14:08:40 tmack Exp $
+# $Id: Method.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 import xmlrpclib
@@ -93,33 +93,48 @@ class Method:
            runtime = time.time() - start
 
             if self.api.config.PLC_API_DEBUG or hasattr(self, 'message'):
-               self.log(0, runtime, *args)
+               self.log(None, runtime, *args)
                
            return result
 
         except PLCFault, fault:
-            # Prepend method name to expected faults
-            fault.faultString = self.name + ": " + fault.faultString
+       
+           caller = ""
+           if isinstance(self.caller, Person):
+               caller = 'person_id %s'  % self.caller['person_id']
+            elif isinstance(self.caller, Node):
+                caller = 'node_id %s'  % self.caller['node_id']
+
+            # Prepend caller and method name to expected faults
+            fault.faultString = caller + ": " +  self.name + ": " + fault.faultString
            runtime = time.time() - start
-           self.log(fault.faultCode, runtime, *args)
+           self.log(fault, runtime, *args)
             raise fault
 
-    def log(self, fault_code, runtime, *args):
+    def log(self, fault, runtime, *args):
         """
         Log the transaction 
         """    
 
        # Do not log system or Get calls
-        if self.name.startswith('system') or self.name.startswith('Get'):
-            return False
+        #if self.name.startswith('system') or self.name.startswith('Get'):
+        #    return False
 
         # Create a new event
         event = Event(self.api)
-        event['fault_code'] = fault_code
+       event['fault_code'] = 0
+       if fault:
+            event['fault_code'] = fault.faultCode
         event['runtime'] = runtime
 
         # Redact passwords and sessions
         if args and isinstance(args[0], dict):
+           # what type of auth this is
+           if args[0].has_key('AuthMethod'):
+               auth_methods = ['session', 'password', 'capability', 'gpg', 'hmac','anonymous']
+               auth_method = args[0]['AuthMethod']
+               if auth_method in auth_methods:
+                   event['auth_type'] = auth_method
             for password in 'AuthString', 'session':
                 if args[0].has_key(password):
                     auth = args[0].copy()
@@ -139,12 +154,16 @@ class Method:
 
         event.sync(commit = False)
 
-        if hasattr(self, 'object_ids'):
-            for object_id in self.object_ids:
-                event.add_object(object_id, commit = False)
+        if hasattr(self, 'event_objects') and isinstance(self.event_objects, dict):
+            for key in self.event_objects.keys():
+               for object_id in self.event_objects[key]:
+                    event.add_object(key, object_id, commit = False)
+       
 
        # Set the message for this event
-       if hasattr(self, 'message'):
+       if fault:
+           event['message'] = fault.faultString
+       elif hasattr(self, 'message'):
             event['message'] = self.message    
        
         # Commit