Commit 07801f3b by Nimisha Asthagiri

Move performance from common to openedx/core

parent 256223d0
...@@ -33,7 +33,7 @@ urlpatterns = ( ...@@ -33,7 +33,7 @@ urlpatterns = (
url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'), url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'),
url(r'^event$', 'track.views.user_track'), url(r'^event$', 'track.views.user_track'),
url(r'^performance$', 'performance.views.performance_log'), url(r'^performance$', 'openedx.core.djangoapps.performance.views.performance_log'),
url(r'^segmentio/event$', 'track.views.segmentio.segmentio_event'), url(r'^segmentio/event$', 'track.views.segmentio.segmentio_event'),
# TODO: Is this used anymore? What is STATIC_GRAB? # TODO: Is this used anymore? What is STATIC_GRAB?
......
"""Tests that performance data is successfully logged.""" # pylint: disable=no-member
"""
Tests that performance data is successfully logged.
"""
import datetime import datetime
import dateutil import dateutil
import json import json
...@@ -8,7 +11,7 @@ from StringIO import StringIO ...@@ -8,7 +11,7 @@ from StringIO import StringIO
from django.test import TestCase from django.test import TestCase
from django.test.client import RequestFactory from django.test.client import RequestFactory
from performance.views import performance_log from openedx.core.djangoapps.performance.views import performance_log
class PerformanceTrackingTest(TestCase): class PerformanceTrackingTest(TestCase):
......
"""
Views for logging performance data.
"""
import datetime import datetime
import json import json
import logging import logging
...@@ -7,7 +10,7 @@ from django.http import HttpResponse ...@@ -7,7 +10,7 @@ from django.http import HttpResponse
from track.utils import DateTimeJSONEncoder from track.utils import DateTimeJSONEncoder
perflog = logging.getLogger("perflog") log = logging.getLogger("perflog")
def _get_request_header(request, header_name, default=''): def _get_request_header(request, header_name, default=''):
...@@ -49,6 +52,6 @@ def performance_log(request): ...@@ -49,6 +52,6 @@ def performance_log(request):
"host": _get_request_header(request, 'SERVER_NAME'), "host": _get_request_header(request, 'SERVER_NAME'),
} }
perflog.info(json.dumps(event, cls=DateTimeJSONEncoder)) log.info(json.dumps(event, cls=DateTimeJSONEncoder))
return HttpResponse(status=204) return HttpResponse(status=204)
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