Remove all Sidekiq-specific stuff from job, enable retries by default

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