- def __log__(vars):
- """
- Commit the transaction
- """
-
- # only log api calls
- if vars['call_name'] in ['listMethods', 'methodSignature']:
- return False
-
- sql = "INSERT INTO events " \
- " (person_id, event_type, object_type, fault_code, call, runtime)" \
- " VALUES (%d, '%s', '%s', %d, '%s', %f)" % \
- (vars['person_id'], vars['event_type'], vars['object_type'],
- vars['fault_code'], vars['call'], vars['runtime'])
- self.api.db.do(sql)
- self.api.db.commit()
-
-
- def wrapper(*args, **kwds):
-
- # Gather necessary logging vars
- fault_code = 0
- person_id = 0
- event_type = 'Unknown'
- object_type = 'Unknown'
- call_name = callable.im_class.__module__.split('.')[-1:][0]
- call_args = ", ".join([str(arg) for arg in list(args)[1:]]).replace('\'', '\\\'')
- call = "%s(%s)" % (call_name, call_args)
-
- if hasattr(self, 'event_type'):
- event_type = self.event_type
- if hasattr(self, 'object_type'):
- object_type = self.object_type
- if self.caller:
- person_id = self.caller['person_id']
-
- start = time.time()
-
- try:
- result = callable(*args, **kwds)
- runtime = time.time() - start
- __log__(locals())
- return result
-
- except PLCFault, fault:
- fault_code = fault.faultCode
- runtime = time.time() - start
- __log__(locals())
- raise fault
-
- return wrapper
-
+
+ # Do not log system or Get calls
+ #if self.name.startswith('system') or self.name.startswith('Get'):
+ # return False
+ # Do not log ReportRunlevel
+ if self.name.startswith('system'):
+ return False
+ if self.name.startswith('ReportRunlevel'):
+ return False
+
+ # Create a new event
+ event = Event(self.api)
+ event['fault_code'] = 0
+ if fault:
+ event['fault_code'] = fault.faultCode
+ event['runtime'] = runtime
+
+ # Redact passwords and sessions
+ newargs = args
+ if args:
+ newargs = []
+ for arg in args:
+ if not isinstance(arg, dict):
+ newargs.append(arg)
+ continue
+ # what type of auth this is
+ if arg.has_key('AuthMethod'):
+ auth_methods = ['session', 'password', 'capability', 'gpg', 'hmac','anonymous']
+ auth_method = arg['AuthMethod']
+ if auth_method in auth_methods:
+ event['auth_type'] = auth_method
+ for password in 'AuthString', 'session', 'password':
+ if arg.has_key(password):
+ arg = arg.copy()
+ arg[password] = "Removed by API"
+ newargs.append(arg)
+
+ # Log call representation
+ # XXX Truncate to avoid DoS
+ event['call'] = self.name + pprint.saferepr(newargs)
+ event['call_name'] = self.name
+
+ # Both users and nodes can call some methods
+ if isinstance(self.caller, Person):
+ event['person_id'] = self.caller['person_id']
+ elif isinstance(self.caller, Node):
+ event['node_id'] = self.caller['node_id']
+
+ event.sync(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()