call logging

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 0953f1c..c326194 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,14 +1,16 @@
 ### $Id$
 ### $URL$
-
+import traceback
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
+from sfa.util.genitable import GeniTable
 from sfa.util.debug import log
 from sfa.server.registry import Registries
 from sfa.util.prefixTree import prefixTree
+from sfa.trust.credential import Credential
 
 class resolve(Method):
     """
@@ -28,9 +30,14 @@ class resolve(Method):
 
     returns = [GeniRecord]
     
-    def call(self, cred, hrn):
+    def call(self, cred, hrn, caller_cred=None):
         
-        self.api.auth.check(cred, 'resolve')
+       self.api.auth.check(cred, 'resolve')
+       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))
         good_records = [] 
 
         # load all know registry names into a prefix tree and attempt to find
@@ -50,19 +57,16 @@ class resolve(Method):
         if registry_hrn != self.api.hrn:
             credential = self.api.getCredential()
             try:
-                records = registries[registry_hrn].resolve(credential, hrn)
-                good_records = [record.as_dict() for record in record_list]
+                records = registries[registry_hrn].resolve(credential, hrn, caller_cred=caller_cred)
+                good_records = [record.as_dict() for record in records]
                 if good_records:
                     return good_records
             except:
-                pass 
+                traceback.print_exc()
 
         # if we still havnt found the record yet, try the local registry
-        auth_hrn = self.api.auth.get_authority(hrn)
-        if not auth_hrn:
-            auth_hrn = hrn
-        table = self.api.auth.get_auth_table(auth_hrn)
-        records = table.resolve('*', hrn)
+        table = GeniTable()
+        records = table.find(hrn)
         if not records:
             raise RecordNotFound(hrn) 
         for record in records:
@@ -70,7 +74,6 @@ class resolve(Method):
                 self.api.fill_record_info(record)
                 good_records.append(dict(record))
             except PlanetLabRecordDoesNotExist:
-                raise
                 # silently drop the ones that are missing in PL
                 print >> log, "ignoring geni record ", record.get_name(), \
                               " because pl record does not exist"