From ab1839c613765890999ad08398500dff322ff7c3 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 31 Mar 2020 19:36:26 -0500 Subject: [PATCH] uploads: fix exception with preprocessed uploads. 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. --- app/jobs/upload_service_delayed_start_job.rb | 4 ++-- app/logical/upload_service.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jobs/upload_service_delayed_start_job.rb b/app/jobs/upload_service_delayed_start_job.rb index 21712822c..d551fdb5e 100644 --- a/app/jobs/upload_service_delayed_start_job.rb +++ b/app/jobs/upload_service_delayed_start_job.rb @@ -2,7 +2,7 @@ class UploadServiceDelayedStartJob < ApplicationJob queue_as :default queue_with_priority(-1) - def perform(uploader) - UploadService.delayed_start(uploader.id) + def perform(params, uploader) + UploadService.new(params).delayed_start(uploader.id) end end diff --git a/app/logical/upload_service.rb b/app/logical/upload_service.rb index 8c975f4e4..3527b063b 100644 --- a/app/logical/upload_service.rb +++ b/app/logical/upload_service.rb @@ -22,7 +22,7 @@ class UploadService preprocessor = Preprocessor.new(params) 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 end