X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=664bb32003f2689be07a63ccfbe15dcb5421faa2;hb=d6bcc3a19ef4edb1b2a7efd436e02d39ab1ce329;hp=6d168bb345399a41577c1191f90c2e68b5628fe1;hpb=dc832ad1a26a47483f8297678a9417640b7c9925;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 6d168bb3..664bb320 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -1,5 +1,5 @@
 # Manifold API Python interface
-import xmlrpclib
+import copy, xmlrpclib
 
 from myslice.config import Config
 
@@ -71,9 +71,9 @@ class ManifoldAPI:
                 if debug:
                     print "====> ManifoldAPI.%s"%repr(),"url",self.url
                     # No password in the logs
-                    logAuth = self.auth
-                    if 'AuthString' in logAuth:
-                        logAuth['AuthString']="XXX"
+                    logAuth = copy.copy(self.auth)
+                    for obfuscate in ['Authring','session']: 
+                        if obfuscate in logAuth:  logAuth[obfuscate]="XXX"
                     print "=> auth",logAuth
                     print "=> args",args,"kwds",kwds
                 annotations = {
@@ -81,6 +81,8 @@ class ManifoldAPI:
                 }
                 args += (annotations,)
                 result=getattr(self.server, methodName)(*args, **kwds)
+                print "%s%r" %(methodName, args)
+                
                 if debug:
                     print '<= result=',
                     self._print_result(result)
@@ -90,14 +92,14 @@ class ManifoldAPI:
 
             except Exception,error:
                 print "** MANIFOLD API ERROR **"
-                if "Connection refused" in error:
-                    raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
-                                                              output="%s answered %s"%(self.url,error)))
-                # otherwise
                 if debug: 
                     print "===== xmlrpc catch-all exception:",error
                     import traceback
                     traceback.print_exc(limit=3)
+                if "Connection refused" in error:
+                    raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
+                                                              output="%s answered %s"%(self.url,error)))
+                # otherwise
                 print "<==== ERROR On ManifoldAPI.%s"%repr()
                 raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE, output="%s"%error) )