sidekiq-grouping 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abbfc33064b0d62493579060635fbdd8449ab118
-  data.tar.gz: 62f8fb16d37730fb087c78e2ea9ecc9a45d9a42a
+  metadata.gz: f9c96db0ae5af0c9a398f9e2a0718b55ede63741
+  data.tar.gz: 69adc754a26f5d4ba89f876f5e39803ba06d7e1f
 SHA512:
-  metadata.gz: f82b31c45dedc4dd5f9c4b73ff4269c78f1ac7e3c564b4064a09575db15eff8dbf938003061f27836a0528945a62b820b6859f230e4b38882a824f63a005ea39
-  data.tar.gz: c30f8345b87e05185f23e26febc766a3b0c857e0a905131dc9586935f8678108ebd3a569e5c5f8168ef225288a2c4834c2d86ca6a21ebd6b387f3eb8ed93ec86
+  metadata.gz: 80ae9e4599902073a2fd7336622f9b15b59f8cd3da25121b6d319dd2cb71f2aa2df56d9e14dbfe682f7b5b1d6d806c90a73cbaadd68f28bcf6f1e1655fa736aa
+  data.tar.gz: 086a0e13a585b06858d34752866099c9efa914139decaac83832dca5571d048ef8532a48cfe0395a92370f4c3554643afcb0f7a93d2330ab0fb517c757deae86

data/README.md

@@ -12,6 +12,7 @@ Useful for:
 
 *NOTE:* As of 1.0 `batch_size` renamed to `batch_flush_size`.
 *NOTE:* As of 1.0.6 works with Sidekiq 4.
+*NOTE:* As of 1.0.8 Locking is atomic (set nx/ex) and will no longer lead to batches that are permalocked and stuck
 
 ## Usage
 

data/lib/sidekiq/grouping/middleware.rb

@@ -2,6 +2,8 @@ module Sidekiq
   module Grouping
     class Middleware
       def call(worker_class, msg, queue, redis_pool = nil)
+        return yield if (defined?(Sidekiq::Testing) && Sidekiq::Testing.inline?)
+
         worker_class = worker_class.camelize.constantize if worker_class.is_a?(String)
         options = worker_class.get_sidekiq_options
 

data/lib/sidekiq/grouping/redis.rb

@@ -52,11 +52,7 @@ module Sidekiq
       def lock(name)
         redis do |conn|
           id = ns("lock:#{name}")
-          conn.setnx(id, true).tap do |obtained|
-            if obtained
-              conn.expire(id, Sidekiq::Grouping::Config.lock_ttl)
-            end
-          end
+          conn.set(id, true, nx: true, ex: Sidekiq::Grouping::Config.lock_ttl)
         end
       end
 

data/lib/sidekiq/grouping/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Grouping
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-grouping
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Victor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Allows identical sidekiq jobs to be processed with a single background call