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 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[myslice.git]
/
manifoldapi
/
manifoldproxy.py
diff --git
a/manifoldapi/manifoldproxy.py
b/manifoldapi/manifoldproxy.py
index
a6f29c3
..
0f700bf
100644
(file)
--- a/
manifoldapi/manifoldproxy.py
+++ b/
manifoldapi/manifoldproxy.py
@@
-10,9
+10,10
@@
from manifold.core.query import Query
from manifold.core.result_value import ResultValue
from manifoldapi import ManifoldAPI
from manifoldresult import ManifoldException
from manifold.core.result_value import ResultValue
from manifoldapi import ManifoldAPI
from manifoldresult import ManifoldException
-from manifold.util.log import Log
-from myslice.settings import config, logger, DEBUG
+# from unfold.sessioncache import SessionCache
+
+from myslice.settings import config, logger
# register activity
import activity.slice
# register activity
import activity.slice
@@
-35,18
+36,18
@@
def proxy (request,format):
# expecting a POST
if request.method != 'POST':
# expecting a POST
if request.method != 'POST':
- logger.error("MANIFOLDPROXY unexpected method
%s -- exiting" % request.method
)
- return HttpResponse ({"ret":0},
mime
type="application/json")
+ logger.error("MANIFOLDPROXY unexpected method
{} -- exiting".format(request.method)
)
+ return HttpResponse ({"ret":0},
content_
type="application/json")
# we only support json for now
# if needed in the future we should probably cater for
# format_in : how is the query encoded in POST
# format_out: how to serve the results
if format != 'json':
# we only support json for now
# if needed in the future we should probably cater for
# format_in : how is the query encoded in POST
# format_out: how to serve the results
if format != 'json':
- logger.error("MANIFOLDPROXY unexpected format
%s -- exiting" % format
)
- return HttpResponse ({"ret":0},
mime
type="application/json")
+ logger.error("MANIFOLDPROXY unexpected format
{} -- exiting".format(format)
)
+ return HttpResponse ({"ret":0},
content_
type="application/json")
try:
# translate incoming POST request into a query object
try:
# translate incoming POST request into a query object
- #logger.debug("MANIFOLDPROXY request.POST
%s" % request.POST
)
+ #logger.debug("MANIFOLDPROXY request.POST
{}".format(request.POST)
)
manifold_query = Query()
#manifold_query = ManifoldQuery()
manifold_query = Query()
#manifold_query = ManifoldQuery()
@@
-62,10
+63,12
@@
def proxy (request,format):
if 'manifold' in request.session:
manifold_api_session_auth = request.session['manifold']['auth']
else:
if 'manifold' in request.session:
manifold_api_session_auth = request.session['manifold']['auth']
else:
- return HttpResponse (json.dumps({'code':0,'value':[]}), mimetype="application/json")
+ #manifold_api_session_auth = SessionCache().get_auth(request)
+ #if not manifold_api_session_auth:
+ return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json")
if debug_empty and manifold_query.action.lower()=='get':
if debug_empty and manifold_query.action.lower()=='get':
- return HttpResponse (json.dumps({'code':0,'value':[]}),
mime
type="application/json")
+ return HttpResponse (json.dumps({'code':0,'value':[]}),
content_
type="application/json")
# actually forward
manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
# actually forward
manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
@@
-85,7
+88,7
@@
def proxy (request,format):
#
# resource reservation
if (manifold_query.action.lower() == 'update') :
#
# resource reservation
if (manifold_query.action.lower() == 'update') :
- print result['value'][0]
+ logger.debug(result['value'][0])
if 'resource' in result['value'][0] :
for resource in result['value'][0]['resource'] :
activity.slice.resource(request,
if 'resource' in result['value'][0] :
for resource in result['value'][0]['resource'] :
activity.slice.resource(request,
@@
-100,13
+103,13
@@
def proxy (request,format):
json_answer=json.dumps(result)
json_answer=json.dumps(result)
- return HttpResponse (json_answer,
mime
type="application/json")
+ return HttpResponse (json_answer,
content_
type="application/json")
- except Exception
,
e:
- logger.error("MANIFOLDPROXY
%s" % e
)
+ except Exception
as
e:
+ logger.error("MANIFOLDPROXY
{}".format(e)
)
import traceback
import traceback
-
traceback.print_exc(
)
- return HttpResponse ({"ret":0},
mime
type="application/json")
+
logger.error(traceback.format_exc()
)
+ return HttpResponse ({"ret":0},
content_
type="application/json")
####################
# see CSRF_FAILURE_VIEW in settings.py
####################
# see CSRF_FAILURE_VIEW in settings.py
@@
-114,5
+117,5
@@
def proxy (request,format):
# this however turns out disappointing/not very informative
failure_answer=[ "csrf_failure" ]
def csrf_failure(request, reason=""):
# this however turns out disappointing/not very informative
failure_answer=[ "csrf_failure" ]
def csrf_failure(request, reason=""):
- print "CSRF failure with reason '%s'"%reason
- return HttpResponseForbidden (json.dumps (failure_answer),
mime
type="application/json")
+ logger.error("CSRF failure with reason '{}'".format(reason))
+ return HttpResponseForbidden (json.dumps (failure_answer),
content_
type="application/json")