diff options
| author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-27 15:31:52 -0500 |
|---|---|---|
| committer | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-27 15:31:52 -0500 |
| commit | cadb8af32dbb8877b096e7f69c401c34260dc902 (patch) | |
| tree | 43bb4a0c623b516a3df3a31fa7a896fccaee48b3 /activejob | |
| parent | e5e42a3687801a1dc1c3e36ea784a7a1479a9230 (diff) | |
| parent | a9a64c490dd5f5038b05338debe439855323afb5 (diff) | |
| download | rails-cadb8af32dbb8877b096e7f69c401c34260dc902.tar.gz rails-cadb8af32dbb8877b096e7f69c401c34260dc902.tar.bz2 rails-cadb8af32dbb8877b096e7f69c401c34260dc902.zip | |
Merge pull request #23284 from maclover7/suckerpunch-2
Update ActiveJob adapter for sucker_punch 2.0
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/lib/active_job/queue_adapters.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/activejob/lib/active_job/queue_adapters.rb b/activejob/lib/active_job/queue_adapters.rb index aeb1fe1e73..2c5039ef4d 100644 --- a/activejob/lib/active_job/queue_adapters.rb +++ b/activejob/lib/active_job/queue_adapters.rb @@ -27,7 +27,7 @@ module ActiveJob # | Resque | Yes | Yes | Yes (Gem) | Queue | Global | Yes | # | Sidekiq | Yes | Yes | Yes | Queue | No | Job | # | Sneakers | Yes | Yes | No | Queue | Queue | No | - # | Sucker Punch | Yes | Yes | No | No | No | No | + # | Sucker Punch | Yes | Yes | Yes | No | No | No | # | Active Job Async | Yes | Yes | Yes | No | No | No | # | Active Job Inline | No | Yes | N/A | N/A | N/A | N/A | # diff --git a/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb index c6c35f8ab4..1037084341 100644 --- a/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb @@ -19,11 +19,22 @@ module ActiveJob # Rails.application.config.active_job.queue_adapter = :sucker_punch class SuckerPunchAdapter def enqueue(job) #:nodoc: - JobWrapper.new.async.perform job.serialize + if JobWrapper.respond_to?(:perform_async) + # sucker_punch 2.0 API + JobWrapper.perform_async job.serialize + else + # sucker_punch 1.0 API + JobWrapper.new.async.perform job.serialize + end end def enqueue_at(job, timestamp) #:nodoc: - raise NotImplementedError, "This queueing backend does not support scheduling jobs. To see what features are supported go to http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html" + if JobWrapper.respond_to?(:perform_in) + delay = timestamp - Time.current.to_f + JobWrapper.perform_in delay, job.serialize + else + raise NotImplementedError, 'sucker_punch 1.0 does not support `enqueued_at`. Please upgrade to version ~> 2.0.0 to enable this behavior.' + end end class JobWrapper #:nodoc: |