logging and call tracing features

[sfa.git] / sfa / methods / list.py

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index e9be62e..5ca15aa 100644 (file)
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -8,6 +8,7 @@ from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.server.registry import Registries
 from sfa.util.prefixTree import prefixTree
+from sfa.trust.credential import Credential
 
 class list(Method):
     """
@@ -17,7 +18,6 @@ class list(Method):
     @param hrn human readable name of authority to list
     @return list of record dictionaries         
     """
-
     interfaces = ['registry']
     
     accepts = [
@@ -27,9 +27,14 @@ class list(Method):
 
     returns = [GeniRecord]
     
-    def call(self, cred, hrn):
-        
+    def call(self, cred, hrn, caller_cred=None):
+
         self.api.auth.check(cred, 'list')
+       if caller_cred==None:
+          caller_cred=cred
+
+       #log the call
+       self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
         records = []
 
         # load all know registry names into a prefix tree and attempt to find
@@ -47,9 +52,9 @@ class list(Method):
         # if the best match (longest matching hrn) is not the local registry,
         # forward the request
         if registry_hrn != self.api.hrn:
-            credential = self.api.getCredential()
+           credential = self.api.getCredential()
             try:
-                record_list = registries[registry_hrn].list(credential, hrn)
+                record_list = registries[registry_hrn].list(credential, hrn, caller_cred=caller_cred)
                 records = [record.as_dict() for record in record_list]
                 if records:
                     return records