merge changes from HEAD

[plcapi.git] / PLC / Method.py

diff --git a/PLC/Method.py b/PLC/Method.py
index 52577f5..552b703 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$
+# $Id: Method.py,v 1.27 2007/05/16 18:56:03 tmack Exp $
 #
 
 import xmlrpclib
@@ -98,8 +98,15 @@ class Method:
            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)
             raise fault
@@ -125,7 +132,7 @@ class Method:
                auth_methods = ['session', 'password', 'capability', 'gpg', 'hmac','anonymous']
                auth_method = args[0]['AuthMethod']
                if auth_method in auth_methods:
-                   event['auth_method'] = auth_method
+                   event['auth_type'] = auth_method
             for password in 'AuthString', 'session':
                 if args[0].has_key(password):
                     auth = args[0].copy()