diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-12-05 11:24:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-05 11:24:19 -0500 |
commit | 299a213a738e078c6fbddd488a711ea9bb066fe2 (patch) | |
tree | 2871f9600b1526625b359107e29c84970fdc18c8 /activejob/lib/active_job | |
parent | 647665110f49935b30e29ac09ecfca3701e76041 (diff) | |
parent | ee9fc120242b83c64bf77af1b72082ac76319332 (diff) | |
download | rails-299a213a738e078c6fbddd488a711ea9bb066fe2.tar.gz rails-299a213a738e078c6fbddd488a711ea9bb066fe2.tar.bz2 rails-299a213a738e078c6fbddd488a711ea9bb066fe2.zip |
Merge pull request #33992 from kirs/enqueue-return-false
Make AJ::Base#enqueue return false if the job wasn't enqueued
Diffstat (limited to 'activejob/lib/active_job')
-rw-r--r-- | activejob/lib/active_job/callbacks.rb | 3 | ||||
-rw-r--r-- | activejob/lib/active_job/enqueuing.rb | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/activejob/lib/active_job/callbacks.rb b/activejob/lib/active_job/callbacks.rb index 61317c7cfc..6b82ea6cab 100644 --- a/activejob/lib/active_job/callbacks.rb +++ b/activejob/lib/active_job/callbacks.rb @@ -29,6 +29,9 @@ module ActiveJob included do define_callbacks :perform define_callbacks :enqueue + + class_attribute :return_false_on_aborted_enqueue, instance_accessor: false, instance_predicate: false + self.return_false_on_aborted_enqueue = false end # These methods will be included into any Active Job object, adding diff --git a/activejob/lib/active_job/enqueuing.rb b/activejob/lib/active_job/enqueuing.rb index b5b9f23c00..58e6d3348d 100644 --- a/activejob/lib/active_job/enqueuing.rb +++ b/activejob/lib/active_job/enqueuing.rb @@ -48,14 +48,25 @@ module ActiveJob self.scheduled_at = options[:wait_until].to_f if options[:wait_until] self.queue_name = self.class.queue_name_from_part(options[:queue]) if options[:queue] self.priority = options[:priority].to_i if options[:priority] + successfully_enqueued = false run_callbacks :enqueue do if scheduled_at self.class.queue_adapter.enqueue_at self, scheduled_at else self.class.queue_adapter.enqueue self end + successfully_enqueued = true + end + if successfully_enqueued + self + else + if self.class.return_false_on_aborted_enqueue + false + else + ActiveSupport::Deprecation.warn "this will return false, set config.active_job.return_false_on_aborted_enqueue = true to remove deprecation." + self + end end - self end end end |