X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=664bb32003f2689be07a63ccfbe15dcb5421faa2;hb=f26eeb7c431cecfbd3ba6cba4d5dab6eeccc2753;hp=1b97505dec9c2e44cd9d726a97975b0ff8026d69;hpb=d1197c134b70bda643a752bdaf891190cb5a15e7;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 1b97505d..664bb320 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -72,8 +72,8 @@ class ManifoldAPI:
                     print "====> ManifoldAPI.%s"%repr(),"url",self.url
                     # No password in the logs
                     logAuth = copy.copy(self.auth)
-                    if 'AuthString' in logAuth:
-                        logAuth['AuthString']="XXX"
+                    for obfuscate in ['Authring','session']: 
+                        if obfuscate in logAuth:  logAuth[obfuscate]="XXX"
                     print "=> auth",logAuth
                     print "=> args",args,"kwds",kwds
                 annotations = {
@@ -92,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) )