X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fmethod.py;h=eb3cba589d0f071c71fb86396dec09786163ff03;hb=1bde0b9053480e43a5fe3e81647f4cd9c2f20fb6;hp=1df1245789f7e27fa5c83dba91c02c035f715762;hpb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;p=sfa.git

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 1df12457..eb3cba58 100644
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -3,24 +3,16 @@
 #
 #
 
-### $Id$
-### $URL$
-
-import os, time
-from types import *
-from types import StringTypes
-import traceback
+import time
+from types import IntType, LongType, StringTypes
 import textwrap
-import xmlrpclib
 
+from sfa.util.sfalogging import logger
+from sfa.util.faults import SfaFault, SfaInvalidAPIMethod, SfaInvalidArgumentCount, SfaInvalidArgument
 
-from sfa.util.faults import * 
-from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
-from sfa.trust.auth import Auth
-from sfa.util.debug import profile, log
+from sfa.storage.parameter import Parameter, Mixed, python_type, xmlrpc_type
 
-# we inherit object because we use new-style classes for legacy methods
-class Method (object):
+class Method:
     """
     Base class for all SfaAPI functions. At a minimum, all SfaAPI
     functions must define:
@@ -48,10 +40,8 @@ class Method (object):
     def call(self, *args):
         """
         Method body for all SfaAPI functions. Must override.
-
         """
-
-        return True
+        return None
 
     def __init__(self, api):
         self.name = self.__class__.__name__
@@ -66,7 +56,7 @@ class Method (object):
     	
     def __call__(self, *args, **kwds):
         """
-        Main entry point for all SfaAPI functions. Type checks
+        Main entry point for all SFA API functions. Type checks
         arguments, authenticates, and executes call().
         """
 
@@ -74,26 +64,23 @@ class Method (object):
             start = time.time()
             methodname = self.name
             if not self.api.interface or self.api.interface not in self.interfaces:
-                raise SfaInvalidAPIMethod, methodname, self.api.interface 
+                raise SfaInvalidAPIMethod(methodname, self.api.interface) 
 
-            # legacy code cannot be type-checked, due to the way Method.args() works
-            if not hasattr(self,"skip_typecheck"):
-                (min_args, max_args, defaults) = self.args()
-	        		
-                # Check that the right number of arguments were passed in
-                if len(args) < len(min_args) or len(args) > len(max_args):
-                    raise SfaInvalidArgumentCount(len(args), len(min_args), len(max_args))
+            (min_args, max_args, defaults) = self.args()
+	    		
+            # Check that the right number of arguments were passed in
+            if len(args) < len(min_args) or len(args) > len(max_args):
+                raise SfaInvalidArgumentCount(len(args), len(min_args), len(max_args))
 
-                for name, value, expected in zip(max_args, args, self.accepts):
-                    self.type_check(name, value, expected, args)
+            for name, value, expected in zip(max_args, args, self.accepts):
+                self.type_check(name, value, expected, args)
 
+            logger.debug("method.__call__ [%s] : BEG %s"%(self.api.interface,methodname))
             result = self.call(*args, **kwds)
-            runtime = time.time() - start
 
-            if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
-                # XX print to some log file
-                # print >> log, "some output"
-	            pass
+            runtime = time.time() - start
+            logger.debug("method.__call__ [%s] : END %s in %02f s (%s)"%\
+                             (self.api.interface,methodname,runtime,getattr(self,'message',"[no-msg]")))
 
             return result
 
@@ -104,9 +91,7 @@ class Method (object):
             # Prepend caller and method name to expected faults
             fault.faultString = caller + ": " +  self.name + ": " + fault.faultString
             runtime = time.time() - start
-	    
-            if self.api.config.SFA_API_DEBUG:
-                traceback.print_exc()
+            logger.log_exc("Method %s raised an exception"%self.name) 
             raise fault
 
 
@@ -258,8 +243,7 @@ class Method (object):
 
         elif not isinstance(value, expected_type):
             raise SfaInvalidArgument("expected %s, got %s" % \
-                                     (xmlrpc_type(expected_type),
-                                      xmlrpc_type(type(value))),
+                                     (xmlrpc_type(expected_type), xmlrpc_type(type(value))),
                                      name)
 
         # If a minimum or maximum (length, value) has been specified