From 01d7adf1f47e74309b72ac1d241729d026f8dd34 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 1 Jun 2017 09:56:10 -0400 Subject: [PATCH 1/2] Revert "Merge pull request #15221 from edx/efischer/celery_logging" This reverts commit 81ef933d919aeadaadc70e9b08d3e4ef6ac508ea, reversing changes made to 44578564753419203680d4ac11ecaefa70550cb9. --- lms/djangoapps/instructor_task/tasks_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/instructor_task/tasks_base.py b/lms/djangoapps/instructor_task/tasks_base.py index 9797f9d2ad..41f199b399 100644 --- a/lms/djangoapps/instructor_task/tasks_base.py +++ b/lms/djangoapps/instructor_task/tasks_base.py @@ -48,7 +48,7 @@ class BaseInstructorTask(Task): This is JSON-serialized and stored in the task_output column of the InstructorTask entry. """ - TASK_LOG.info('Task %s: success returned with progress: %s', task_id, task_progress) + TASK_LOG.debug('Task %s: success returned with progress: %s', task_id, task_progress) # We should be able to find the InstructorTask object to update # based on the task_id here, without having to dig into the # original args to the task. On the other hand, the entry_id @@ -81,7 +81,7 @@ class BaseInstructorTask(Task): Note that there is no way to record progress made within the task (e.g. attempted, succeeded, etc.) when such failures occur. """ - TASK_LOG.info(u'Task %s: failure returned', task_id) + TASK_LOG.debug(u'Task %s: failure returned', task_id) entry_id = args[0] try: entry = InstructorTask.objects.get(pk=entry_id) From 1b9c36be879c14bc8bf38a4ed11185ee10937ce1 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 1 Jun 2017 12:41:47 -0400 Subject: [PATCH 2/2] Revert "Merge pull request #15229 from edx/efischer/celery_logging" This reverts commit e64c3a35ece4321874681d0ca339de343a6efcfe, reversing changes made to 867fac315fb3180adfc2108573c2d16852422e78. --- lms/djangoapps/instructor_task/tasks_helper/grades.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lms/djangoapps/instructor_task/tasks_helper/grades.py b/lms/djangoapps/instructor_task/tasks_helper/grades.py index 8cc0753aae..bfc47a0712 100644 --- a/lms/djangoapps/instructor_task/tasks_helper/grades.py +++ b/lms/djangoapps/instructor_task/tasks_helper/grades.py @@ -210,11 +210,7 @@ class CourseGradeReport(object): batched_rows = self._batched_rows(context) context.update_status(u'Compiling grades') - try: - success_rows, error_rows = self._compile(context, batched_rows) - except Exception: # pylint:disable=broad-except - TASK_LOG.exception('Something failed in compilation') - return context.update_status('Failed grades') + success_rows, error_rows = self._compile(context, batched_rows) context.update_status(u'Uploading grades') self._upload(context, success_headers, success_rows, error_headers, error_rows)