aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-08 15:06:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-08 15:06:46 -0300
commit30ea1a70cba1124893b2479cb7f277cb260ddfcd (patch)
treeef9d7a30f92f577da2e9ada8e98df598b4eb65ef
parentee9f86e2e3e91f0b3b079b4931afa65d23b68e8a (diff)
parent1472e0cf2c013370813ee45245f7cd781ef3b794 (diff)
downloadrails-30ea1a70cba1124893b2479cb7f277cb260ddfcd.tar.gz
rails-30ea1a70cba1124893b2479cb7f277cb260ddfcd.tar.bz2
rails-30ea1a70cba1124893b2479cb7f277cb260ddfcd.zip
Merge pull request #17215 from aripollak/sidekiq-no-retry-option
Don't pass retry option to Sidekiq
-rw-r--r--activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
index 7d80a6fd7a..21005fc728 100644
--- a/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -21,8 +21,7 @@ module ActiveJob
Sidekiq::Client.push \
'class' => JobWrapper,
'queue' => job.queue_name,
- 'args' => [ job.serialize ],
- 'retry' => true
+ 'args' => [ job.serialize ]
end
def enqueue_at(job, timestamp) #:nodoc:
@@ -30,7 +29,6 @@ module ActiveJob
'class' => JobWrapper,
'queue' => job.queue_name,
'args' => [ job.serialize ],
- 'retry' => true,
'at' => timestamp
end
end