From 8b599ee424d70e0856c1ea20585ea0986759ba93 Mon Sep 17 00:00:00 2001 From: Syed Hassan Raza Date: Fri, 13 Feb 2015 16:21:13 +0500 Subject: [PATCH] python standard logging --- lms/djangoapps/bulk_email/tasks.py | 4 ++-- lms/djangoapps/instructor_task/subtasks.py | 4 ++-- lms/djangoapps/instructor_task/tasks_helper.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py index 4cb5384137..d136f42a65 100644 --- a/lms/djangoapps/bulk_email/tasks.py +++ b/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 diff --git a/lms/djangoapps/instructor_task/subtasks.py b/lms/djangoapps/instructor_task/subtasks.py index 093eddce98..dae83f9d6b 100644 --- a/lms/djangoapps/instructor_task/subtasks.py +++ b/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 diff --git a/lms/djangoapps/instructor_task/tasks_helper.py b/lms/djangoapps/instructor_task/tasks_helper.py index 7f48999633..e6b0b62c4d 100644 --- a/lms/djangoapps/instructor_task/tasks_helper.py +++ b/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'