git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
manifold
/
manifoldapi.py
diff --git
a/manifold/manifoldapi.py
b/manifold/manifoldapi.py
index
ee1f82e
..
664bb32
100644
(file)
--- a/
manifold/manifoldapi.py
+++ b/
manifold/manifoldapi.py
@@
-1,5
+1,5
@@
# Manifold API Python interface
# Manifold API Python interface
-import xmlrpclib
+import
copy,
xmlrpclib
from myslice.config import Config
from myslice.config import Config
@@
-70,13
+70,19
@@
class ManifoldAPI:
try:
if debug:
print "====> ManifoldAPI.%s"%repr(),"url",self.url
try:
if debug:
print "====> ManifoldAPI.%s"%repr(),"url",self.url
- print "=> auth",self.auth
+ # No password in the logs
+ 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 = {
'authentication': self.auth
}
args += (annotations,)
result=getattr(self.server, methodName)(*args, **kwds)
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)
if debug:
print '<= result=',
self._print_result(result)
@@
-86,14
+92,14
@@
class ManifoldAPI:
except Exception,error:
print "** MANIFOLD API ERROR **"
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 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) )
print "<==== ERROR On ManifoldAPI.%s"%repr()
raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE, output="%s"%error) )