From 27709d11f42bffd570c64b76a80b85c91f3e5aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esm=C3=A9=20Cowles?= Date: Thu, 7 Feb 2019 08:09:29 -0500 Subject: [PATCH] Always queue fixity jobs as super_low priority --- app/change_set_persisters/change_set_persister/check_fixity.rb | 2 +- app/jobs/check_fixity_job.rb | 1 + app/jobs/check_fixity_recursive_job.rb | 3 ++- app/jobs/create_derivatives_job.rb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/change_set_persisters/change_set_persister/check_fixity.rb b/app/change_set_persisters/change_set_persister/check_fixity.rb index ca4cbba5d3..21944f5528 100644 --- a/app/change_set_persisters/change_set_persister/check_fixity.rb +++ b/app/change_set_persisters/change_set_persister/check_fixity.rb @@ -14,7 +14,7 @@ def run # Don't run if a file has been updated; fixity will run after characterization on the new file new_file_scenarios = ["files", "pending_uploads"] return unless (change_set.changed.keys & new_file_scenarios).empty? - ::CheckFixityJob.set(queue: change_set_persister.queue).perform_later(change_set.resource.id.to_s) + ::CheckFixityJob.perform_later(change_set.resource.id.to_s) end end end diff --git a/app/jobs/check_fixity_job.rb b/app/jobs/check_fixity_job.rb index 83f6da4be5..5d089bb465 100644 --- a/app/jobs/check_fixity_job.rb +++ b/app/jobs/check_fixity_job.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true class CheckFixityJob < ApplicationJob + queue_as :super_low delegate :query_service, to: :metadata_adapter def perform(file_set_id) diff --git a/app/jobs/check_fixity_recursive_job.rb b/app/jobs/check_fixity_recursive_job.rb index 975c940aa2..be2c2673ac 100644 --- a/app/jobs/check_fixity_recursive_job.rb +++ b/app/jobs/check_fixity_recursive_job.rb @@ -1,10 +1,11 @@ # frozen_string_literal: true class CheckFixityRecursiveJob < ApplicationJob + queue_as :super_low delegate :query_service, to: :metadata_adapter def perform CheckFixityJob.perform_now(next_file_set.id) - CheckFixityRecursiveJob.set(queue: :super_low).perform_later + CheckFixityRecursiveJob.perform_later end private diff --git a/app/jobs/create_derivatives_job.rb b/app/jobs/create_derivatives_job.rb index a00628f36f..318630d1a1 100644 --- a/app/jobs/create_derivatives_job.rb +++ b/app/jobs/create_derivatives_job.rb @@ -7,7 +7,7 @@ def perform(file_set_id) file_set = query_service.find_by(id: Valkyrie::ID.new(file_set_id)) Valkyrie::Derivatives::DerivativeService.for(FileSetChangeSet.new(file_set)).create_derivatives messenger.derivatives_created(file_set) - CheckFixityJob.set(queue: queue_name).perform_later(file_set_id) + CheckFixityJob.perform_later(file_set_id) rescue Valkyrie::Persistence::ObjectNotFoundError => error Valkyrie.logger.warn "#{self.class}: #{error}: Failed to find the resource #{file_set_id}" end