Move queue interface url and auth into configuration, rather than hardcoding it

This commit is contained in:
Calen Pennington
2012-08-09 13:28:13 -04:00
parent cfe712cb2a
commit 91b6bb649c
4 changed files with 23 additions and 11 deletions

View File

@@ -7,9 +7,9 @@ from django.http import Http404
from django.http import HttpResponse
from django.views.decorators.csrf import csrf_exempt
from capa.xqueue_interface import XQueueInterface
from django.contrib.auth.models import User
from xmodule.modulestore.django import modulestore
from capa.xqueue_interface import qinterface
from mitxmako.shortcuts import render_to_string
from models import StudentModule, StudentModuleCache
from static_replace import replace_urls
@@ -23,6 +23,12 @@ from courseware.courses import (has_staff_access_to_course,
log = logging.getLogger("mitx.courseware")
xqueue_interface = XQueueInterface(
settings.XQUEUE_INTERFACE['url'],
settings.XQUEUE_INTERFACE['auth']
)
def make_track_function(request):
'''
Make a tracking function that logs what happened.
@@ -172,9 +178,9 @@ def get_module(user, request, location, student_module_cache, position=None):
# TODO: Queuename should be derived from 'course_settings.json' of each course
xqueue_default_queuename = descriptor.location.org + '-' + descriptor.location.course
xqueue = { 'interface': qinterface,
'callback_url': xqueue_callback_url,
'default_queuename': xqueue_default_queuename.replace(' ','_') }
xqueue = {'interface': xqueue_interface,
'callback_url': xqueue_callback_url,
'default_queuename': xqueue_default_queuename.replace(' ', '_')}
def _get_module(location):
return get_module(user, request, location,