sidekiq 2.7.0 → 2.7.1

data/Changes.md

@@ -1,3 +1,9 @@
+2.7.1
+-----------
+
+- Fix issue with hard shutdown [#680]
+
+
 2.7.0
 -----------
 

data/lib/sidekiq/fetch.rb

@@ -13,9 +13,8 @@ module Sidekiq
     TIMEOUT = 1
 
     def initialize(mgr, options)
-      klass = Sidekiq.options[:fetch] || BasicFetch
       @mgr = mgr
-      @strategy = klass.new(options)
+      @strategy = Fetcher.strategy.new(options)
     end
 
     # Fetching is straightforward: the Manager makes a fetch
@@ -57,6 +56,10 @@ module Sidekiq
     def self.done?
       @done
     end
+
+    def self.strategy
+      Sidekiq.options[:fetch] || BasicFetch
+    end
   end
 
   class BasicFetch

data/lib/sidekiq/manager.rb

@@ -118,7 +118,7 @@ module Sidekiq
           # contract says that jobs are run AT LEAST once. Process termination
           # is delayed until we're certain the jobs are back in Redis because
           # it is worse to lose a job than to run it twice.
-          Sidekiq.options[:fetch].bulk_requeue(@in_progress.values)
+          Sidekiq::Fetcher.strategy.bulk_requeue(@in_progress.values)
 
           # Clearing workers in Redis
           # NOTE: we do this before terminating worker threads because the

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   TTNOenY4ek5CblVKakg1L0E1aWdDSUFMKzZ2VTcrc3UKc0xGK0pDRlBiQmd2
   UnFMNWhYMDNDS3V5T1VObVVWVDVBbkNEbmZJRFVWL2tKaFg3V2ZyNklxYVVI
   bVVjeS9qbgpleTZobHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis