diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-07 16:37:29 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-07 16:37:29 -0300 |
commit | d84bfaa8530e42188f0361efb5a61c73948192e6 (patch) | |
tree | fd5bd31589bf3c5637d9dd8215d86f9d655478f6 /activejob/lib | |
parent | 0a5a6c0c3679872de47e5d5091963e6a6eee06b8 (diff) | |
parent | dd8e859829bfcfd8cb0287ce804055b827a35af1 (diff) | |
download | rails-d84bfaa8530e42188f0361efb5a61c73948192e6.tar.gz rails-d84bfaa8530e42188f0361efb5a61c73948192e6.tar.bz2 rails-d84bfaa8530e42188f0361efb5a61c73948192e6.zip |
Merge pull request #19910 from kddeisz/delayed_job_provider_job_id
Get provider_job_id from DelayedJob
Diffstat (limited to 'activejob/lib')
-rw-r--r-- | activejob/lib/active_job/core.rb | 3 | ||||
-rw-r--r-- | activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb index acdfcdc791..0528572cd0 100644 --- a/activejob/lib/active_job/core.rb +++ b/activejob/lib/active_job/core.rb @@ -17,6 +17,9 @@ module ActiveJob # Queue in which the job will reside. attr_writer :queue_name + + # ID optionally provided by adapter + attr_accessor :provider_job_id end # These methods will be included into any Active Job object, adding diff --git a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb index 852a6ee326..ac83da2b9c 100644 --- a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb @@ -14,11 +14,15 @@ module ActiveJob # Rails.application.config.active_job.queue_adapter = :delayed_job class DelayedJobAdapter def enqueue(job) #:nodoc: - Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name) + delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name) + job.provider_job_id = delayed_job.id + delayed_job end def enqueue_at(job, timestamp) #:nodoc: - Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, run_at: Time.at(timestamp)) + delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, run_at: Time.at(timestamp)) + job.provider_job_id = delayed_job.id + delayed_job end class JobWrapper #:nodoc: |