sidekiq-throttled 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aedce59e6d54d8e5b87efee69f613db617d7549
-  data.tar.gz: 6e8ec470ea953aa7fd43f0a4962dc1a1590538c6
+  metadata.gz: 3f24a091044117cd299dc478eca0cdf2592b7e05
+  data.tar.gz: 18cd12c9b4a9a8e4ce273f959a4deae29c7d2c14
 SHA512:
-  metadata.gz: b5b30e4cc7703c5d40882b43efc78da6cc514af7134f9e22909ee30018778012d4ac193f53cb6f71fa0babc0800bf5601aa93011e0390caed04dfa11e6fe0d32
-  data.tar.gz: d94c1159801231e63725d7d55cdd92587248bc1f1bda4d8c6f089c3e1abc0d1341375740263f33e68037e9af08f7e92b364c2b545ca263cb9a19a82be8868568
+  metadata.gz: d02ac4f96d6aaf4cae1d0b2a5958efbef48d86410c18b933f9da3fb492c5e6487a7dd6bcf612e1858e0bd0c355827f6b6071341ea2b42ad73b9f59d805cfe8d6
+  data.tar.gz: e9c0d68e0fc016cdbd5369f8d342339fde7c0e67f40cd1a1446025839ccbf7f9c26f9eabed5fafa8521387d93ae3bb61483cfd2f5cae6722488833fc90148939

data/CHANGES.md

@@ -1,6 +1,12 @@
+## 0.6.5 (2016-09-04)
+
+* Fix concurrency throttling when redis-namespace is used.
+  ([@ixti])
+
+
 ## 0.6.4 (2016-09-02)
 
-* Rename UNitOfWork throttled requeue to `#requeue_throttled`.
+* Rename UnitOfWork throttled requeue to `#requeue_throttled`.
   ([@ixti])
 
 

data/lib/sidekiq/throttled/communicator.rb

@@ -22,6 +22,7 @@ module Sidekiq
     #   # Emit message from console
     #   Sidekiq.redis do |conn|
     #     Communicator.instance.transmit(conn, "knock", "ixti")
+    #   end
     class Communicator
       include Singleton
       include ExceptionHandler

data/lib/sidekiq/throttled/fetch.rb

@@ -33,6 +33,7 @@ module Sidekiq
         return work unless work.throttled?
 
         work.requeue_throttled
+        sleep TIMEOUT
 
         nil
       end

data/lib/sidekiq/throttled/strategy/concurrency.lua

@@ -1,7 +1,7 @@
 local key = KEYS[1]
-local jid = KEYS[2]
-local lmt = tonumber(ARGV[1])
-local ttl = tonumber(ARGV[2])
+local jid = ARGV[1]
+local lmt = tonumber(ARGV[2])
+local ttl = tonumber(ARGV[3])
 
 if lmt <= redis.call("SCARD", key) and 0 == redis.call("SISMEMBER", key, jid) then
   return 1

data/lib/sidekiq/throttled/strategy/concurrency.rb

@@ -44,7 +44,7 @@ module Sidekiq
 
         # @return [Boolean] whenever job is throttled or not
         def throttled?(jid, *job_args)
-          1 == SCRIPT.eval([key(job_args), jid.to_s], [limit(job_args), @ttl])
+          1 == SCRIPT.eval([key(job_args)], [jid.to_s, limit(job_args), @ttl])
         end
 
         # @return [Integer] Current count of jobs
@@ -55,7 +55,7 @@ module Sidekiq
         # Resets count of jobs
         # @return [void]
         def reset!(*job_args)
-          Sidekiq.redis { |conn| conn.del(key(job_args)) }.to_i
+          Sidekiq.redis { |conn| conn.del(key(job_args)) }
         end
 
         # Remove jid from the pool of jobs in progress

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.6.4".freeze
+    VERSION = "0.6.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq