sidekiq 2.3.1 → 2.3.2

data/Changes.md

@@ -1,3 +1,8 @@
+2.3.2
+-----------
+
+- Fix retry.  2.3.1 accidentally disabled it.
+
 2.3.1
 -----------
 

data/lib/sidekiq/client.rb

@@ -118,12 +118,12 @@ module Sidekiq
       raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
       raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item['class'].ancestors.inspect}") if !item['class'].is_a?(Class) || !item['class'].respond_to?('get_sidekiq_options')
 
-      normalized_item = item.dup
+      normalized_item = item['class'].get_sidekiq_options.merge(item.dup)
       normalized_item['class'] = normalized_item['class'].to_s
       normalized_item['retry'] = !!normalized_item['retry']
       normalized_item['jid'] = SecureRandom.hex(12)
 
-      item['class'].get_sidekiq_options.merge normalized_item
+      normalized_item
     end
 
   end

data/lib/sidekiq/processor.rb

@@ -1,4 +1,3 @@
-require 'socket'
 require 'celluloid'
 require 'sidekiq/util'
 
@@ -67,7 +66,7 @@ module Sidekiq
         conn.multi do
           conn.sadd('workers', self)
           conn.setex("worker:#{self}:started", EXPIRY, Time.now.to_s)
-          hash = {:queue => queue, :payload => msg, :run_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z")}
+          hash = {:queue => queue, :payload => msg, :run_at => Time.now.to_i }
           conn.setex("worker:#{self}", EXPIRY, Sidekiq.dump_json(hash))
         end
       end
@@ -106,9 +105,5 @@ module Sidekiq
         SINGLETON_CLASSES.include?(val.class) ? val : val.clone
       end
     end
-
-    def hostname
-      @h ||= Socket.gethostname
-    end
   end
 end

data/lib/sidekiq/util.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'sidekiq/exception_handler'
 
 module Sidekiq
@@ -37,5 +38,9 @@ module Sidekiq
     def process_id
       Process.pid
     end
+
+    def hostname
+      Socket.gethostname
+    end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/test/test_client.rb

@@ -144,4 +144,9 @@ class TestClient < MiniTest::Unit::TestCase
     end
   end
 
+  describe 'item normalization' do
+    it 'defaults retry to true' do
+      assert_equal true, Sidekiq::Client.normalize_item('class' => QueuedWorker, 'args' => [])['retry']
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis