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
6d168bb
..
180807b
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
@@
-71,9
+71,9
@@
class ManifoldAPI:
if debug:
print "====> ManifoldAPI.%s"%repr(),"url",self.url
# No password in the logs
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 = {
print "=> auth",logAuth
print "=> args",args,"kwds",kwds
annotations = {
@@
-81,6
+81,8
@@
class ManifoldAPI:
}
args += (annotations,)
result=getattr(self.server, methodName)(*args, **kwds)
}
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)
@@
-90,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) )
@@
-111,6
+113,8
@@
def _execute_query(request, query, manifold_api_session_auth):
print "-"*80
result = manifold_api.forward(query.to_dict())
if result['code'] == 2:
print "-"*80
result = manifold_api.forward(query.to_dict())
if result['code'] == 2:
+ # XXX only if we know it is the issue
+ del request.session['manifold']
raise Exception, 'Error running query: %r' % result
if result['code'] == 1:
raise Exception, 'Error running query: %r' % result
if result['code'] == 1: