Bug in tracking framework when no cookie
This commit is contained in:
@@ -19,15 +19,25 @@ def user_track(request):
|
||||
except:
|
||||
username = "anonymous"
|
||||
|
||||
try:
|
||||
scookie = request.META['HTTP_COOKIE']
|
||||
except:
|
||||
scookie = ""
|
||||
|
||||
try:
|
||||
agent = request.META['HTTP_USER_AGENT']
|
||||
except:
|
||||
agent = ''
|
||||
|
||||
# TODO: Move a bunch of this into log_event
|
||||
event = {
|
||||
"username" : username,
|
||||
"session" : request.META['HTTP_COOKIE'],
|
||||
"session" : scookie,
|
||||
"ip" : request.META['REMOTE_ADDR'],
|
||||
"event_source" : "browser",
|
||||
"event_type" : request.GET['event_type'],
|
||||
"event" : request.GET['event'],
|
||||
"agent" : request.META['HTTP_USER_AGENT'],
|
||||
"agent" : agent,
|
||||
"page" : request.GET['page'],
|
||||
}
|
||||
log_event(event)
|
||||
@@ -39,13 +49,18 @@ def server_track(request, event_type, event, page=None):
|
||||
except:
|
||||
username = "anonymous"
|
||||
|
||||
try:
|
||||
agent = request.META['HTTP_USER_AGENT']
|
||||
except:
|
||||
agent = ''
|
||||
|
||||
event = {
|
||||
"username" : username,
|
||||
"ip" : request.META['REMOTE_ADDR'],
|
||||
"event_source" : "server",
|
||||
"event_type" : event_type,
|
||||
"event" : event,
|
||||
"agent" : request.META['HTTP_USER_AGENT'],
|
||||
"agent" : agent,
|
||||
"page" : page,
|
||||
}
|
||||
log_event(event)
|
||||
|
||||
4
urls.py
4
urls.py
@@ -28,14 +28,14 @@ urlpatterns = ('',
|
||||
url(r'^password_reset_done/$',django.contrib.auth.views.password_reset_done,
|
||||
name='auth_password_reset_done'),
|
||||
url(r'^send_feedback$', 'util.views.send_feedback'),
|
||||
url(r'^courseware/$', 'courseware.views.index'),
|
||||
)
|
||||
|
||||
if settings.PERFSTATS:
|
||||
urlpatterns=urlpatterns + (url(r'^reprofile$','perfstats.views.end_profile'),)
|
||||
|
||||
if settings.COURSEWARE_ENABLED:
|
||||
urlpatterns=urlpatterns + (url(r'^wiki/', include('simplewiki.urls')),
|
||||
urlpatterns=urlpatterns + ( url(r'^courseware/$', 'courseware.views.index'),
|
||||
url(r'^wiki/', include('simplewiki.urls')),
|
||||
url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index'),
|
||||
url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index'),
|
||||
url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index'),
|
||||
|
||||
Reference in New Issue
Block a user