# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Method.py,v 1.17 2006/11/03 23:44:51 mlhuang Exp $
+# $Id: Method.py,v 1.29 2007/08/20 20:31:47 tmack Exp $
#
import xmlrpclib
result = self.call(*args, **kwds)
runtime = time.time() - start
- if self.api.config.PLC_API_DEBUG:
- self.log(0, runtime, *args)
+ if self.api.config.PLC_API_DEBUG: #or hasattr(self, 'message'):
+ 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()
# Log call representation
# XXX Truncate to avoid DoS
event['call'] = self.name + pprint.saferepr(args)
+ event['call_name'] = self.name
# Both users and nodes can call some methods
if isinstance(self.caller, Person):
event.sync(commit = False)
- # XXX object_ids is currently defined as a class variable
- 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 fault:
+ event['message'] = fault.faultString
+ elif hasattr(self, 'message'):
+ event['message'] = self.message
+
# Commit
- event.sync(commit = True)
+ event.sync()
def help(self, indent = " "):
"""