diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index 2784737eea353906b83e630b22f4e68851ba3266..42d0f2bf89fb8b2894529075ad83386c3cf880b3 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -50,7 +50,7 @@ from xmodule.course_module import CourseDescriptor from xmodule.modulestore import Location from xmodule.modulestore.exceptions import ItemNotFoundError -log = logging.getLogger("mitx.external_auth") +log = logging.getLogger("edx.external_auth") AUDIT_LOG = logging.getLogger("audit") SHIBBOLETH_DOMAIN_PREFIX = 'shib:' diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index 1ed6126e9b695613d2ab5865138e11d6a0b60511..734b3a1ec460b51a64c4a6e7aba0e42346d80e21 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -702,7 +702,7 @@ def update_user_information(sender, instance, created, **kwargs): cc_user = cc.User.from_django_user(instance) cc_user.save() except Exception as e: - log = logging.getLogger("mitx.discussion") + log = logging.getLogger("edx.discussion") log.error(unicode(e)) log.error("update user info to discussion failed for user with id: " + str(instance.id)) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 96ccba46e68801c498afcc01daa94c26959114cd..878630272a8ed92ea0638fd1d86ab898ffead8bc 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -72,7 +72,7 @@ from pytz import UTC from util.json_request import JsonResponse -log = logging.getLogger("mitx.student") +log = logging.getLogger("edx.student") AUDIT_LOG = logging.getLogger("audit") Article = namedtuple('Article', 'title url author image deck publication publish_date') diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index cf6c2e3dce1759d06f337442f3bdc758657cd855..b78e2a4a5019680b1c3240aee745249e022958e8 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -24,7 +24,7 @@ from .fields import Timedelta, Date from django.utils.timezone import UTC from django.utils.translation import ugettext as _ -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") # Generate this many different variants of problems with rerandomize=per_student diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 2eb8585d854e0209a39175a09e7d7f939cac427f..960db4db7d1d244ef2e14b3c4c024fd072ae96e2 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -11,7 +11,7 @@ from collections import namedtuple from .fields import Date, Timedelta import textwrap -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") V1_SETTINGS_ATTRIBUTES = [ "display_name", diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/common/lib/xmodule/xmodule/conditional_module.py index b7a48fb82a1948e08a0c27b013b50055a2209341..824834337183118d7c5e4dc7c206214d28e8b0ed 100644 --- a/common/lib/xmodule/xmodule/conditional_module.py +++ b/common/lib/xmodule/xmodule/conditional_module.py @@ -15,7 +15,7 @@ from xblock.fields import Scope, List from xmodule.modulestore.exceptions import ItemNotFoundError -log = logging.getLogger('mitx.' + __name__) +log = logging.getLogger('edx.' + __name__) class ConditionalFields(object): diff --git a/common/lib/xmodule/xmodule/graders.py b/common/lib/xmodule/xmodule/graders.py index 10ef86ebdc0c1afbcfa93d6d84cd4de7e3c3d40e..d51e1414c34a0c4188daae5ac8bc79f493200314 100644 --- a/common/lib/xmodule/xmodule/graders.py +++ b/common/lib/xmodule/xmodule/graders.py @@ -6,7 +6,7 @@ import sys from collections import namedtuple -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") # This is a tuple for holding scores, either from problems or sections. # Section either indicates the name of the problem or the name of the section diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py index 25cebe8e420f85ae1153f41a10c91521e2d6a403..73b5baf2d6c609c1c21a76a51194e74a0a214aed 100644 --- a/common/lib/xmodule/xmodule/html_module.py +++ b/common/lib/xmodule/xmodule/html_module.py @@ -16,7 +16,7 @@ from xmodule.xml_module import XmlDescriptor, name_to_pathname import textwrap from xmodule.contentstore.content import StaticContent -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") class HtmlFields(object): diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py index 7ed33e567316ee73596dad5b5b7e524847efe2ef..ebec6d6ee8b4383c2115c40e3717cf5476a71918 100644 --- a/common/lib/xmodule/xmodule/modulestore/__init__.py +++ b/common/lib/xmodule/xmodule/modulestore/__init__.py @@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod from .exceptions import InvalidLocationError, InsufficientSpecificationError from xmodule.errortracker import make_error_tracker -log = logging.getLogger('mitx.' + 'modulestore') +log = logging.getLogger('edx.modulestore') SPLIT_MONGO_MODULESTORE_TYPE = 'split' MONGO_MODULESTORE_TYPE = 'mongo' diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index 72915eb7b36f5a46f464682228a4bfdf163d90fd..2c02833baa5ae1911e1fdfc7822456221332c3ff 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -13,7 +13,7 @@ from .combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMA from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, MockPeerGradingService, GradingServiceError from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") # Set the default number of max attempts. Should be 1 for production # Set higher for debugging/testing diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py index d020987fdf6cae3c7ac2ced6f996172177cc619a..680ed031d12303be702695a1629f042a1813e183 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py @@ -23,7 +23,7 @@ from pytz import UTC from .combined_open_ended_rubric import CombinedOpenEndedRubric -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") class OpenEndedModule(openendedchild.OpenEndedChild): diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py index 6b98744ccd42e44887551b68f05280ef6668b36a..2d6ba8411832d872f23a6faa43502ada01aa29f3 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py @@ -11,11 +11,10 @@ import controller_query_service from datetime import datetime from pytz import UTC -import requests from boto.s3.connection import S3Connection from boto.s3.key import Key -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") # Set the default number of max attempts. Should be 1 for production # Set higher for debugging/testing diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py index 45295fd09f77dc6cbc8709feb4b7f9587ef5ea8a..cb9d1e72c5f05a23bc977b2ffe31172ca470cba9 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py @@ -9,7 +9,7 @@ import openendedchild from .combined_open_ended_rubric import CombinedOpenEndedRubric -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") class SelfAssessmentModule(openendedchild.OpenEndedChild): diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/common/lib/xmodule/xmodule/randomize_module.py index 71d23012d1a46daac72420e5fda102d337f7d8e1..56b7c079aafba0e72968f72fc41d96e840c43933 100644 --- a/common/lib/xmodule/xmodule/randomize_module.py +++ b/common/lib/xmodule/xmodule/randomize_module.py @@ -9,7 +9,7 @@ from lxml import etree from xblock.fields import Scope, Integer from xblock.fragment import Fragment -log = logging.getLogger('mitx.' + __name__) +log = logging.getLogger('edx.' + __name__) class RandomizeFields(object): diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py index f17a3486d537564caef19fe24c0c83af3cfce9ad..49b67ecc40ac71f2585c893e1a7f72863805a810 100644 --- a/lms/djangoapps/courseware/grades.py +++ b/lms/djangoapps/courseware/grades.py @@ -22,7 +22,7 @@ from xmodule.graders import Score from .models import StudentModule from .module_render import get_module, get_module_for_descriptor -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") def yield_module_descendents(module): diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index 0608e2c75989d82fc8dd45616842016dc9edfd7e..fcf122629561df5846ec6f815f2c4cdca351a928 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -38,7 +38,7 @@ from xmodule.modulestore.search import path_to_location from xmodule.course_module import CourseDescriptor import shoppingcart -log = logging.getLogger("mitx.courseware") +log = logging.getLogger("edx.courseware") template_imports = {'urllib': urllib} diff --git a/lms/djangoapps/licenses/models.py b/lms/djangoapps/licenses/models.py index db24126a8e25b41570a605d5f439f16de5444f6f..f91048d269e259bcbef516c1c3212d3829442c38 100644 --- a/lms/djangoapps/licenses/models.py +++ b/lms/djangoapps/licenses/models.py @@ -4,7 +4,7 @@ from django.db import models, transaction from student.models import User -log = logging.getLogger("mitx.licenses") +log = logging.getLogger("edx.licenses") class CourseSoftware(models.Model): diff --git a/lms/djangoapps/licenses/views.py b/lms/djangoapps/licenses/views.py index 42ecb9ecf19c14254b92e535478b6b3116b4f205..657d6cd0c7ee1540c642755cb5ae29da855985cb 100644 --- a/lms/djangoapps/licenses/views.py +++ b/lms/djangoapps/licenses/views.py @@ -16,7 +16,7 @@ from licenses.models import CourseSoftware from licenses.models import get_courses_licenses, get_or_create_license, get_license -log = logging.getLogger("mitx.licenses") +log = logging.getLogger("edx.licenses") License = namedtuple('License', 'software serial') diff --git a/lms/djangoapps/lms_migration/migrate.py b/lms/djangoapps/lms_migration/migrate.py index 18d9a5101747d06fa369695a4cef83dc7c4d0b8f..d00030bd43c876e28b1acb0b80fa0622560117eb 100644 --- a/lms/djangoapps/lms_migration/migrate.py +++ b/lms/djangoapps/lms_migration/migrate.py @@ -17,7 +17,7 @@ try: except ImportError: from django.contrib.csrf.middleware import csrf_exempt -log = logging.getLogger("mitx.lms_migrate") +log = logging.getLogger("edx.lms_migrate") LOCAL_DEBUG = True ALLOWED_IPS = settings.LMS_MIGRATION_ALLOWED_IPS diff --git a/lms/djangoapps/psychometrics/psychoanalyze.py b/lms/djangoapps/psychometrics/psychoanalyze.py index c6e66445a48d09f83e99333b25ebeec9e29e3170..dac10e0b070c4f30e594b7c8ef4f94aa1f77ab77 100644 --- a/lms/djangoapps/psychometrics/psychoanalyze.py +++ b/lms/djangoapps/psychometrics/psychoanalyze.py @@ -18,7 +18,7 @@ from psychometrics.models import PsychometricData from courseware.models import StudentModule from pytz import UTC -log = logging.getLogger("mitx.psychometrics") +log = logging.getLogger("edx.psychometrics") #db = "ocwtutor" # for debugging #db = "default"