Merge branch 'master' into eucalyptus-devel

[sfa.git] / sfa / util / method.py

diff --git a/sfa/util/method.py b/sfa/util/method.py
index c5dc1e6..43b589c 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -79,12 +79,14 @@ class Method:
             for name, value, expected in zip(max_args, args, self.accepts):
                 self.type_check(name, value, expected, args)
 
+            if self.api.config.SFA_API_DEBUG:
+                sfa_logger().debug("method.__call__ [%s] : BEG %s"%(self.api.interface,methodname))
             result = self.call(*args, **kwds)
-            runtime = time.time() - start
 
+            runtime = time.time() - start
             if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
-                msg=getattr(self,'message',"method %s completed in %02f s"%(methodname,runtime))
-                sfa_logger().debug(msg)
+                sfa_logger().debug("method.__call__ [%s] : END %s in %02f s (%s)"%\
+                                       (self.api.interface,methodname,runtime,getattr(self,'message',"[no-msg]")))
 
             return result