resolve conflict manually

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

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 9a3d457..125629d 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -91,8 +91,8 @@ class Method (object):
             runtime = time.time() - start
 
             if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
-                msg=getattr(self,'message',"method %s completed"%methodname)
-                sfa_logger.info(msg)
+                msg=getattr(self,'message',"method %s completed in %02f s"%(methodname,runtime))
+                sfa_logger().debug(msg)
 
             return result
 
@@ -103,7 +103,7 @@ class Method (object):
             # Prepend caller and method name to expected faults
             fault.faultString = caller + ": " +  self.name + ": " + fault.faultString
             runtime = time.time() - start
-            sfa_logger.log_exc("Method %s raised an exception"%self.name) 
+            sfa_logger().log_exc("Method %s raised an exception"%self.name) 
             raise fault