Merge pull request #7022 from edx/shr/log/PLAT-438-Celery-should-not-hijack-the-root-logger-hotfix

python standard logging

lms/djangoapps/bulk_email/tasks.py

@@ -7,6 +7,7 @@ import random
 import json
 from time import sleep
 from collections import Counter
+import logging
 
 import dogstats_wrapper as dog_stats_api
 from smtplib import SMTPServerDisconnected, SMTPDataError, SMTPConnectError, SMTPException
@@ -24,7 +25,6 @@ from boto.ses.exceptions import (
 from boto.exception import AWSConnectionError
 
 from celery import task, current_task
-from celery.utils.log import get_task_logger
 from celery.states import SUCCESS, FAILURE, RETRY
 from celery.exceptions import RetryTaskError
 
@@ -48,7 +48,7 @@ from instructor_task.subtasks import (
 )
 from util.query import use_read_replica_if_available
 
-log = get_task_logger(__name__)
+log = logging.getLogger('edx.celery.task')
 
 
 # Errors that an individual email is failing to be sent, and should just

lms/djangoapps/instructor_task/subtasks.py

@@ -7,8 +7,8 @@ from uuid import uuid4
 import math
 import psutil
 from contextlib import contextmanager
+import logging
 
-from celery.utils.log import get_task_logger
 from celery.states import SUCCESS, READY_STATES, RETRY
 import dogstats_wrapper as dog_stats_api
 
@@ -17,7 +17,7 @@ from django.core.cache import cache
 
 from instructor_task.models import InstructorTask, PROGRESS, QUEUING
 
-TASK_LOG = get_task_logger(__name__)
+TASK_LOG = logging.getLogger('edx.celery.task')
 
 # Lock expiration should be long enough to allow a subtask to complete.
 SUBTASK_LOCK_EXPIRE = 60 * 10  # Lock expires in 10 minutes

lms/djangoapps/instructor_task/tasks_helper.py

@@ -7,9 +7,9 @@ import json
 from datetime import datetime
 from time import time
 import unicodecsv
+import logging
 
 from celery import Task, current_task
-from celery.utils.log import get_task_logger
 from celery.states import SUCCESS, FAILURE
 from django.contrib.auth.models import User
 from django.core.files.storage import DefaultStorage
@@ -38,7 +38,7 @@ from student.models import CourseEnrollment
 
 
 # define different loggers for use within tasks and on client side
-TASK_LOG = get_task_logger(__name__)
+TASK_LOG = logging.getLogger('edx.celery.task')
 
 # define value to use when no task_id is provided:
 UNKNOWN_TASK_ID = 'unknown-task_id'