diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-28 01:08:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 01:08:22 -0300 |
| commit | 410a21416ee2817aeea653d48f624d390f336b5f (patch) | |
| tree | 1e4f023f0235660286ea91876efc8c8d6c37a5a7 /activejob/lib | |
| parent | 303353fc95ed9f1ada74a7bfac7e8304745a7fee (diff) | |
| parent | 80e825915c7ff638f4b668a7cca1be46903cb433 (diff) | |
| download | rails-410a21416ee2817aeea653d48f624d390f336b5f.tar.gz rails-410a21416ee2817aeea653d48f624d390f336b5f.tar.bz2 rails-410a21416ee2817aeea653d48f624d390f336b5f.zip | |
Merge pull request #25961 from Azzurrio/master
Fix accessing provider_job_id inside active jobs for sidekiq adapter
Diffstat (limited to 'activejob/lib')
| -rw-r--r-- | activejob/lib/active_job/core.rb | 1 | ||||
| -rw-r--r-- | activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb index f7f882c998..f0606b3834 100644 --- a/activejob/lib/active_job/core.rb +++ b/activejob/lib/active_job/core.rb @@ -105,6 +105,7 @@ module ActiveJob # end def deserialize(job_data) self.job_id = job_data['job_id'] + self.provider_job_id = job_data['provider_job_id'] self.queue_name = job_data['queue_name'] self.priority = job_data['priority'] self.serialized_arguments = job_data['arguments'] diff --git a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb index c321776bf5..3d33b3923b 100644 --- a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb @@ -37,7 +37,7 @@ module ActiveJob include Sidekiq::Worker def perform(job_data) - Base.execute job_data + Base.execute job_data.merge('provider_job_id' => jid) end end end |