ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix parallel sis batch progress interval 

the marshalling to/from the child serialized delayed job isn't including
@last_progress_update, causing errors comparing a time to nil.

refs CNVS-14640

Change-Id: I6636335202921c0210edce2ebebd4eef4ec22dac
Reviewed-on: https://gerrit.instructure.com/39358
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Brian Palmer 2014-08-14 16:38:40 -06:00
parent 24d3ddd01f
commit ac3a81c819
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sis/csv/import.rb
View File

@ -58,7 +58,6 @@ module SIS
@total_rows = 1
@current_row = 0
@last_progress_update = Time.now
@progress_multiplier = opts[:progress_multiplier] || 1
@progress_offset = opts[:progress_offset] || 0
@ -236,6 +235,7 @@ module SIS
end
def update_progress?
@last_progress_update ||= Time.now
update_interval = Setting.get('sis_batch_progress_interval', 2.seconds).to_i
@last_progress_update < update_interval.ago
end