Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/djangoapps/external_auth/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
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:'
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/student/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/student/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
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')
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/capa_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/combined_open_ended_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .fields import Date, Timedelta
import textwrap

log = logging.getLogger("mitx.courseware")
log = logging.getLogger("edx.courseware")

V1_SETTINGS_ATTRIBUTES = [
"display_name",
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/conditional_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from xmodule.modulestore.exceptions import ItemNotFoundError


log = logging.getLogger('mitx.' + __name__)
log = logging.getLogger('edx.' + __name__)


class ConditionalFields(object):
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/graders.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

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
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/html_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import textwrap
from xmodule.contentstore.content import StaticContent

log = logging.getLogger("mitx.courseware")
log = logging.getLogger("edx.courseware")


class HtmlFields(object):
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/modulestore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

from .combined_open_ended_rubric import CombinedOpenEndedRubric

log = logging.getLogger("mitx.courseware")
log = logging.getLogger("edx.courseware")


class OpenEndedModule(openendedchild.OpenEndedChild):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from .combined_open_ended_rubric import CombinedOpenEndedRubric

log = logging.getLogger("mitx.courseware")
log = logging.getLogger("edx.courseware")


class SelfAssessmentModule(openendedchild.OpenEndedChild):
Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/randomize_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from xblock.fields import Scope, Integer
from xblock.fragment import Fragment

log = logging.getLogger('mitx.' + __name__)
log = logging.getLogger('edx.' + __name__)


class RandomizeFields(object):
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/grades.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
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):
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from xmodule.course_module import CourseDescriptor
import shoppingcart

log = logging.getLogger("mitx.courseware")
log = logging.getLogger("edx.courseware")

template_imports = {'urllib': urllib}

Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/licenses/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from student.models import User

log = logging.getLogger("mitx.licenses")
log = logging.getLogger("edx.licenses")


class CourseSoftware(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/licenses/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
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')
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/lms_migration/migrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
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

Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/psychometrics/psychoanalyze.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
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"
Expand Down