diff options
| author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
|---|---|---|
| committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
| commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
| tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /activestorage/app | |
| parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
| parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
| download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip | |
Merge remote-tracking branch 'upstream/master' into nofollow-change
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 | 5 | ||||
| -rw-r--r-- | activestorage/app/jobs/active_storage/purge_job.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/activestorage/app/jobs/active_storage/analyze_job.rb b/activestorage/app/jobs/active_storage/analyze_job.rb index a11a73d030..2a952f9f74 100644 --- a/activestorage/app/jobs/active_storage/analyze_job.rb +++ b/activestorage/app/jobs/active_storage/analyze_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Provides asynchronous analysis of ActiveStorage::Blob records via ActiveStorage::Blob#analyze_later. -class ActiveStorage::AnalyzeJob < ActiveJob::Base +class ActiveStorage::AnalyzeJob < ActiveStorage::BaseJob def perform(blob) blob.analyze end diff --git a/activestorage/app/jobs/active_storage/base_job.rb b/activestorage/app/jobs/active_storage/base_job.rb new file mode 100644 index 0000000000..6caab42a2d --- /dev/null +++ b/activestorage/app/jobs/active_storage/base_job.rb @@ -0,0 +1,5 @@ +# 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 188840f702..98874d2250 100644 --- a/activestorage/app/jobs/active_storage/purge_job.rb +++ b/activestorage/app/jobs/active_storage/purge_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Provides asynchronous purging of ActiveStorage::Blob records via ActiveStorage::Blob#purge_later. -class ActiveStorage::PurgeJob < ActiveJob::Base +class ActiveStorage::PurgeJob < ActiveStorage::BaseJob # FIXME: Limit this to a custom ActiveStorage error retry_on StandardError |