Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
3b1c8424
Commit
3b1c8424
authored
7 years ago
by
Eric Fischer
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #15228 from edx/efischer/revert_temp_logging
Revert "Merge pull request #15221 from edx/efischer/celery_logging"
parents
c3a1905a
1b9c36be
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lms/djangoapps/instructor_task/tasks_base.py
+2
-2
2 additions, 2 deletions
lms/djangoapps/instructor_task/tasks_base.py
lms/djangoapps/instructor_task/tasks_helper/grades.py
+1
-5
1 addition, 5 deletions
lms/djangoapps/instructor_task/tasks_helper/grades.py
with
3 additions
and
7 deletions
lms/djangoapps/instructor_task/tasks_base.py
+
2
−
2
View file @
3b1c8424
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
lms/djangoapps/instructor_task/tasks_helper/grades.py
+
1
−
5
View file @
3b1c8424
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment