Merge pull request #13691 from edx/common_cleanup/performance
Move performance from common to openedx/core
This commit is contained in:
@@ -33,7 +33,7 @@ urlpatterns = (
|
||||
|
||||
url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'),
|
||||
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'),
|
||||
|
||||
# TODO: Is this used anymore? What is STATIC_GRAB?
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
"""Tests that performance data is successfully logged."""
|
||||
# pylint: disable=no-member
|
||||
"""
|
||||
Tests that performance data is successfully logged.
|
||||
"""
|
||||
import datetime
|
||||
import dateutil
|
||||
import json
|
||||
@@ -8,7 +11,7 @@ from StringIO import StringIO
|
||||
|
||||
from django.test import TestCase
|
||||
from django.test.client import RequestFactory
|
||||
from performance.views import performance_log
|
||||
from openedx.core.djangoapps.performance.views import performance_log
|
||||
|
||||
|
||||
class PerformanceTrackingTest(TestCase):
|
||||
@@ -1,3 +1,6 @@
|
||||
"""
|
||||
Views for logging performance data.
|
||||
"""
|
||||
import datetime
|
||||
import json
|
||||
import logging
|
||||
@@ -7,7 +10,7 @@ from django.http import HttpResponse
|
||||
from track.utils import DateTimeJSONEncoder
|
||||
|
||||
|
||||
perflog = logging.getLogger("perflog")
|
||||
log = logging.getLogger("perflog")
|
||||
|
||||
|
||||
def _get_request_header(request, header_name, default=''):
|
||||
@@ -49,6 +52,6 @@ def performance_log(request):
|
||||
"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)
|
||||
Reference in New Issue
Block a user