resolve conflict manually

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

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 473bcd1..125629d 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -14,10 +14,10 @@ import textwrap
 import xmlrpclib
 
 
+from sfa.util.sfalogging import sfa_logger
 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
 
 # we inherit object because we use new-style classes for legacy methods
 class Method (object):
@@ -91,9 +91,8 @@ class Method (object):
             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
+                msg=getattr(self,'message',"method %s completed in %02f s"%(methodname,runtime))
+                sfa_logger().debug(msg)
 
             return result
 
@@ -104,9 +103,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()
+            sfa_logger().log_exc("Method %s raised an exception"%self.name) 
             raise fault