X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=debd1f7a5cf7fe5c9f3ab298ee8c281a72b5726a;hp=3577fe5aed64ac8ea6419858b0d9b5d2badce485;hb=a52c3773de8611def256d97dd699ba09d390b8fd;hpb=f8a556326c2a66f26f8b2114c0a6d03985b671c0 diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py index 3577fe5a..debd1f7a 100644 --- a/manifold/manifoldproxy.py +++ b/manifold/manifoldproxy.py @@ -16,10 +16,6 @@ from myslice.config import Config debug=False #debug=True -# add artificial delay in s -debug_spin=0 -#debug_spin=1 - # pretend the server only returns - empty lists to 'get' requests - this is to mimick # misconfigurations or expired credentials or similar corner case situations debug_empty=False @@ -59,6 +55,7 @@ with the query passed using POST""" admin_user, admin_password = Config().manifold_admin_user_password() manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password} else: + print request.session['manifold'] manifold_api_session_auth = request.session['manifold']['auth'] if debug_empty and manifold_query.action.lower()=='get': @@ -81,12 +78,6 @@ with the query passed using POST""" json_answer=json.dumps(result) - # this is an artificial delay added for debugging purposes only - if debug_spin>0: - print "Adding additional artificial delay",debug_spin - import time - time.sleep(debug_spin) - return HttpResponse (json_answer, mimetype="application/json") except Exception,e: