X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fapi.py;h=f9aed1cf44e69b86a3fe5c8293b27c815b03a16f;hb=dbce495b6f2e7d8dccbfb18c5507907d784c143b;hp=8343969e16af40a86fcd1d88bac612a07fb6a0d7;hpb=ed1ec5e2208d463a93bc3557e74cb95024a10f38;p=sfa.git

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 8343969e..f9aed1cf 100644
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -1,9 +1,6 @@
 #
 # SFA XML-RPC and SOAP interfaces
 #
-### $Id$
-### $URL$
-#
 
 import sys
 import os
@@ -11,14 +8,12 @@ import traceback
 import string
 import xmlrpclib
 
+from sfa.util.sfalogging import sfa_logger
 from sfa.trust.auth import Auth
 from sfa.util.config import *
 from sfa.util.faults import *
-from sfa.util.debug import *
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.namespace import *
-from sfa.util.sfalogging import *
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -95,6 +90,27 @@ def import_deep(name):
         mod = getattr(mod, comp)
     return mod
 
+class ManagerWrapper:
+    """
+    This class acts as a wrapper around an SFA interface manager module, but
+    can be used with any python module. The purpose of this class is raise a 
+    SfaNotImplemented exception if the a someone attepmts to use an attribute 
+    (could be a callable) thats not available in the library by checking the
+    library using hasattr. This helps to communicate better errors messages 
+    to the users and developers in the event that a specifiec operation 
+    is not implemented by a libarary and will generally be more helpful than
+    the standard AttributeError         
+    """
+    def __init__(self, manager, interface):
+        self.manager = manager
+        self.interface = interface
+        
+    def __getattr__(self, method):
+        
+        if not hasattr(self.manager, method):
+            raise SfaNotImplemented(method, self.interface)
+        return getattr(self.manager, method)
+        
 class BaseAPI:
 
     cache = None
@@ -127,7 +143,7 @@ class BaseAPI:
         self.credential = None
         self.source = None 
         self.time_format = "%Y-%m-%d %H:%M:%S"
-        self.logger=get_sfa_logger()
+        self.logger=sfa_logger
         
         # load registries
         from sfa.server.registry import Registries
@@ -158,8 +174,11 @@ class BaseAPI:
             manager_module = manager_base + ".component_manager_%s" % mgr_type
         else:
             raise SfaAPIError("No manager for interface: %s" % self.interface)  
-        manager = __import__(manager_module, fromlist=[manager_base])   
- 
+        manager = __import__(manager_module, fromlist=[manager_base])
+        # this isnt necessary but will hlep to produce better error messages
+        # if someone tries to access an operation this manager doesn't implement  
+        manager = ManagerWrapper(manager, self.interface)
+
         return manager
 
     def callable(self, method):
@@ -219,7 +238,7 @@ class BaseAPI:
         except SfaFault, fault:
             result = fault 
         except Exception, fault:
-            traceback.print_exc(file = log)
+            sfa_logger().log_exc("BaseAPI.handle has caught Exception")
             result = SfaAPIError(fault)