diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-01-01 19:40:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-01 19:40:59 -0500 |
| commit | ed51351536294b5cee9923727f401c5eb4dc2af1 (patch) | |
| tree | 6a5cbb1655ddb1f7f76d39464724a8ebfecb485f /activestorage/app | |
| parent | 0dec2b5aa367d4f858e7878f1f5d1fcda2dd37de (diff) | |
| download | rails-ed51351536294b5cee9923727f401c5eb4dc2af1.tar.gz rails-ed51351536294b5cee9923727f401c5eb4dc2af1.tar.bz2 rails-ed51351536294b5cee9923727f401c5eb4dc2af1.zip | |
Permit sending Active Storage purge and analysis jobs to separate queues
Diffstat (limited to 'activestorage/app')
| -rw-r--r-- | activestorage/app/jobs/active_storage/analyze_job.rb | 2 | ||||
| -rw-r--r-- | activestorage/app/jobs/active_storage/base_job.rb | 1 | ||||
| -rw-r--r-- | activestorage/app/jobs/active_storage/purge_job.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/activestorage/app/jobs/active_storage/analyze_job.rb b/activestorage/app/jobs/active_storage/analyze_job.rb index 804ee4557a..35d043d508 100644 --- a/activestorage/app/jobs/active_storage/analyze_job.rb +++ b/activestorage/app/jobs/active_storage/analyze_job.rb @@ -2,6 +2,8 @@ # Provides asynchronous analysis of ActiveStorage::Blob records via ActiveStorage::Blob#analyze_later. class ActiveStorage::AnalyzeJob < ActiveStorage::BaseJob + queue_as { ActiveStorage.queues[:analysis] } + retry_on ActiveStorage::IntegrityError, attempts: 10, wait: :exponentially_longer def perform(blob) diff --git a/activestorage/app/jobs/active_storage/base_job.rb b/activestorage/app/jobs/active_storage/base_job.rb index 6caab42a2d..7bc2064dc5 100644 --- a/activestorage/app/jobs/active_storage/base_job.rb +++ b/activestorage/app/jobs/active_storage/base_job.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true class ActiveStorage::BaseJob < ActiveJob::Base - queue_as { ActiveStorage.queue } end diff --git a/activestorage/app/jobs/active_storage/purge_job.rb b/activestorage/app/jobs/active_storage/purge_job.rb index 2604977bf1..5ceb222005 100644 --- a/activestorage/app/jobs/active_storage/purge_job.rb +++ b/activestorage/app/jobs/active_storage/purge_job.rb @@ -2,6 +2,8 @@ # Provides asynchronous purging of ActiveStorage::Blob records via ActiveStorage::Blob#purge_later. class ActiveStorage::PurgeJob < ActiveStorage::BaseJob + queue_as { ActiveStorage.queues[:purge] } + discard_on ActiveRecord::RecordNotFound retry_on ActiveRecord::Deadlocked, attempts: 10, wait: :exponentially_longer |