diff options
author | Mike Perham <mperham@gmail.com> | 2014-05-20 06:57:29 -0700 |
---|---|---|
committer | Mike Perham <mperham@gmail.com> | 2014-05-20 06:57:29 -0700 |
commit | 42f5ba37a4bf3cd9369643e479b91a5f97bce779 (patch) | |
tree | 4af19f0926bc7f42efe9939ff5853edf154efcb7 | |
parent | c813a30c5a3031108bdd41b57571803c13f95569 (diff) | |
download | rails-42f5ba37a4bf3cd9369643e479b91a5f97bce779.tar.gz rails-42f5ba37a4bf3cd9369643e479b91a5f97bce779.tar.bz2 rails-42f5ba37a4bf3cd9369643e479b91a5f97bce779.zip |
Remove all Sidekiq-specific stuff from job, enable retries by default
-rw-r--r-- | lib/active_job/queue_adapters/sidekiq_adapter.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb index 087e833d24..0cf9e47287 100644 --- a/lib/active_job/queue_adapters/sidekiq_adapter.rb +++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb @@ -5,8 +5,11 @@ module ActiveJob class SidekiqAdapter class << self def queue(job, *args) - item = { 'class' => JobWrapper, 'queue' => job.queue_name, 'args' => [job, *args] } - Sidekiq::Client.push(job.get_sidekiq_options.merge(item)) + item = { 'class' => JobWrapper, + 'queue' => job.queue_name, + 'args' => [job, *args], + 'retry' => true } + Sidekiq::Client.push(item) end end @@ -15,14 +18,9 @@ module ActiveJob def perform(job_name, *args) instance = job_name.constantize.new - instance.jid = self.jid instance.perform *Parameters.deserialize(args) end end end end end - -class ActiveJob::Base - include Sidekiq::Worker -end |