X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldapi.py;h=aab968b407d7f29364a7225d71c1681f7f72beba;hb=5157e8e19cbfd0a8b31fab00e75de248a7bc59e2;hp=8f27d92a3f56add1f6ed00628bbf5948cf9db096;hpb=a948414844c79472807c5e66939a912a7b990433;p=myslice.git diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py index 8f27d92a..aab968b4 100644 --- a/manifoldapi/manifoldapi.py +++ b/manifoldapi/manifoldapi.py @@ -115,7 +115,7 @@ def _execute_query(url, request, query, manifold_api_session_auth): def execute_query(request, query): - logger.debug("EXECUTE QUERY: request - {}".format(request.session.items())) + #logger.debug("EXECUTE QUERY: request - {}".format(request.session.items())) if not 'manifold' in request.session or not 'auth' in request.session['manifold']: #manifold_api_session_auth = SessionCache().get_auth(request) @@ -133,12 +133,13 @@ def execute_query(request, query): def execute_admin_query(request, query): # xxx config + from myslice.settings import config + url = config.manifold_url() + admin_user, admin_password = config.manifold_admin_user_password() if not admin_user or not admin_password: logger.error("""CONFIG: you need to setup admin_user and admin_password in myslice.ini Some functions won't work properly until you do so""") admin_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password} - from myslice.settings import config - url = config.manifold_url() return _execute_query(url, request, query, admin_auth)