git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
edd95f4
)
REST SFA timeout=5 if AM or Registry is down
author
Loic Baron
<loic.baron@lip6.fr>
Fri, 4 Dec 2015 09:47:58 +0000
(10:47 +0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Fri, 4 Dec 2015 09:47:58 +0000
(10:47 +0100)
rest/sfa_api.py
patch
|
blob
|
history
diff --git
a/rest/sfa_api.py
b/rest/sfa_api.py
index
b35fa35
..
14ec310
100644
(file)
--- a/
rest/sfa_api.py
+++ b/
rest/sfa_api.py
@@
-203,7
+203,7
@@
def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
#return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
return {'error' : '-2'}
- server = SfaServerProxy(server_url, pkey, cert)
+ server = SfaServerProxy(server_url, pkey, cert
, verbose=False, timeout=5
)
#server = SFAProxy(server_url, pkey, cert)
if 'geni_rspec_version' in options:
# GetVersion to know if the AM supports the requested version