Commit 9ad26e06 by Piotr Mitros

Bug in tracking framework when no cookie

parent 2222e5b7
...@@ -19,15 +19,25 @@ def user_track(request): ...@@ -19,15 +19,25 @@ def user_track(request):
except: except:
username = "anonymous" 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 # TODO: Move a bunch of this into log_event
event = { event = {
"username" : username, "username" : username,
"session" : request.META['HTTP_COOKIE'], "session" : scookie,
"ip" : request.META['REMOTE_ADDR'], "ip" : request.META['REMOTE_ADDR'],
"event_source" : "browser", "event_source" : "browser",
"event_type" : request.GET['event_type'], "event_type" : request.GET['event_type'],
"event" : request.GET['event'], "event" : request.GET['event'],
"agent" : request.META['HTTP_USER_AGENT'], "agent" : agent,
"page" : request.GET['page'], "page" : request.GET['page'],
} }
log_event(event) log_event(event)
...@@ -39,13 +49,18 @@ def server_track(request, event_type, event, page=None): ...@@ -39,13 +49,18 @@ def server_track(request, event_type, event, page=None):
except: except:
username = "anonymous" username = "anonymous"
try:
agent = request.META['HTTP_USER_AGENT']
except:
agent = ''
event = { event = {
"username" : username, "username" : username,
"ip" : request.META['REMOTE_ADDR'], "ip" : request.META['REMOTE_ADDR'],
"event_source" : "server", "event_source" : "server",
"event_type" : event_type, "event_type" : event_type,
"event" : event, "event" : event,
"agent" : request.META['HTTP_USER_AGENT'], "agent" : agent,
"page" : page, "page" : page,
} }
log_event(event) log_event(event)
...@@ -28,14 +28,14 @@ urlpatterns = ('', ...@@ -28,14 +28,14 @@ urlpatterns = ('',
url(r'^password_reset_done/$',django.contrib.auth.views.password_reset_done, url(r'^password_reset_done/$',django.contrib.auth.views.password_reset_done,
name='auth_password_reset_done'), name='auth_password_reset_done'),
url(r'^send_feedback$', 'util.views.send_feedback'), url(r'^send_feedback$', 'util.views.send_feedback'),
url(r'^courseware/$', 'courseware.views.index'),
) )
if settings.PERFSTATS: if settings.PERFSTATS:
urlpatterns=urlpatterns + (url(r'^reprofile$','perfstats.views.end_profile'),) urlpatterns=urlpatterns + (url(r'^reprofile$','perfstats.views.end_profile'),)
if settings.COURSEWARE_ENABLED: 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>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index'),
url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index'), url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index'),
url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index'), url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment