jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uploads: fix exception with preprocessed uploads.

Browse Source 
Fix exception when submitting an upload and an in-progress preprocessed
upload already exists. In this case we forgot to pass the upload params
when calling UploadService#delayed_start.
This commit is contained in:
evazion
2020-03-31 19:36:26 -05:00
parent 3051daf5eb
commit ab1839c613
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/upload_service_delayed_start_job.rb
View File

@@ -2,7 +2,7 @@ class UploadServiceDelayedStartJob < ApplicationJob
queue_as :default queue_as :default
queue_with_priority(-1) queue_with_priority(-1)
def perform(uploader) def perform(params, uploader)
UploadService.delayed_start(uploader.id) UploadService.new(params).delayed_start(uploader.id)
end end
end end

2
app/logical/upload_service.rb
View File

@@ -22,7 +22,7 @@ class UploadService
preprocessor = Preprocessor.new(params) preprocessor = Preprocessor.new(params)
if preprocessor.in_progress? if preprocessor.in_progress?
UploadServiceDelayedStartJob.set(wait: 5.seconds).perform_later(CurrentUser.user) UploadServiceDelayedStartJob.set(wait: 5.seconds).perform_later(params, CurrentUser.user)
return preprocessor.predecessor return preprocessor.predecessor
end end