Merge pull request #38 from mperham/rework_sidekiq

Reimplement Sidekiq adapter

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb
index c8fac32963..0cf9e47287 100644
--- a/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -5,7 +5,11 @@ module ActiveJob
     class SidekiqAdapter
       class << self
         def queue(job, *args)
-          JobWrapper.client_push class: JobWrapper, queue: job.queue_name, args: [ job, *args ]
+          item = { 'class' => JobWrapper,
+                   'queue' => job.queue_name,
+                   'args' => [job, *args],
+                   'retry' => true }
+          Sidekiq::Client.push(item)
         end
       end
 
@@ -13,7 +17,8 @@ module ActiveJob
         include Sidekiq::Worker
 
         def perform(job_name, *args)
-          job_name.constantize.new.perform *Parameters.deserialize(args)
+          instance = job_name.constantize.new
+          instance.perform *Parameters.deserialize(args)
         end
       end
     end