X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=eea606e3bfd56d740538e95bfab640614745f6b0;hb=7b369897171d7d8bf3b30bf6d8200813b3e142e0;hp=1ffcacee0725669778edd628436fb496744cbd04;hpb=e6184193b74ac6d5c52289546dae9121bdd99008;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 1ffcacee..eea606e3 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
 
@@ -32,6 +32,12 @@ class ManifoldAPI:
 
     def __repr__ (self): return "ManifoldAPI[%s]"%self.url
 
+    def _print_value (self, value):
+        print "+++",'value',
+        if isinstance (value,list):     print "[%d]"%len(value),
+        elif isinstance (value,dict):   print "{%d}"%len(value),
+        print mytruncate (value,80)
+    
     # a one-liner to give a hint of what the return value looks like
     def _print_result (self, result):
         if not result:                        print "[no/empty result]"
@@ -41,7 +47,8 @@ class ManifoldAPI:
             print "result is a dict with %d keys : %s"%(len(result),result.keys())
             for (k,v) in result.iteritems(): 
                 if v is None: continue
-                print '+++',k,':',mytruncate (v,60)
+                if k=='value':  self._print_value(v)
+                else:           print '+++',k,':',mytruncate (v,30)
         else:                                 print "[dont know how to display result] %s"%result
 
     # xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info
@@ -63,13 +70,19 @@ class ManifoldAPI:
             try:
                 if debug:
                     print "====> ManifoldAPI.%s"%repr(),"url",self.url
-                    print "=> auth",self.auth
+                    # No password in the logs
+                    logAuth = copy.copy(self.auth)
+                    if 'AuthString' in logAuth:
+                        logAuth['AuthString']="XXX"
+                    print "=> auth",logAuth
                     print "=> args",args,"kwds",kwds
                 annotations = {
                     'authentication': self.auth
                 }
                 args += (annotations,)
                 result=getattr(self.server, methodName)(*args, **kwds)
+                print "%s%r" %(methodName, args)
+                
                 if debug:
                     print '<= result=',
                     self._print_result(result)
@@ -79,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) )