X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldproxy.py;h=0f700bf7c3f5cfc14c24144bdba15a6e3a7542f0;hb=3d6c5110a118df0efbd5a3d0de4a0dbd5331b2a5;hp=a6f29c3402bc2dccd180ab0eaca0a0e0060ce39c;hpb=8203b2f617faf5f0f36184952677fa1077172093;p=myslice.git diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py index a6f29c34..0f700bf7 100644 --- 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.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 @@ -35,18 +36,18 @@ def proxy (request,format): # expecting a POST if request.method != 'POST': - logger.error("MANIFOLDPROXY unexpected method %s -- exiting" % request.method) - return HttpResponse ({"ret":0}, mimetype="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': - logger.error("MANIFOLDPROXY unexpected format %s -- exiting" % format) - return HttpResponse ({"ret":0}, mimetype="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 - #logger.debug("MANIFOLDPROXY request.POST %s" % request.POST) + #logger.debug("MANIFOLDPROXY request.POST {}".format(request.POST)) 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: - 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': - return HttpResponse (json.dumps({'code':0,'value':[]}), mimetype="application/json") + return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") # 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') : - 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, @@ -100,13 +103,13 @@ def proxy (request,format): json_answer=json.dumps(result) - return HttpResponse (json_answer, mimetype="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 - traceback.print_exc() - return HttpResponse ({"ret":0}, mimetype="application/json") + logger.error(traceback.format_exc()) + return HttpResponse ({"ret":0}, content_type="application/json") #################### # 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=""): - print "CSRF failure with reason '%s'"%reason - return HttpResponseForbidden (json.dumps (failure_answer), mimetype="application/json") + logger.error("CSRF failure with reason '{}'".format(reason)) + return HttpResponseForbidden (json.dumps (failure_answer), content_type="application/json")