sidekiq-ultimate 0.0.1.alpha.12 → 0.0.1.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda9a7246c8e37b21ee222f0055a30b94eba47868c3c51b7b107b1425eb0ca6d
-  data.tar.gz: 47b59be61f08cf78eb67ee6096e8eb8faec313863585cea05e5ddc9b55281bf6
+  metadata.gz: 6aeaaa91356179d4d35a74d8e2c2b00dba07e40b540d4ece946e6b3cac2c48ef
+  data.tar.gz: e8e7b7d548104c54e087623065313c0e358782abdf74a3000847b72e541438fa
 SHA512:
-  metadata.gz: 94e44aaea6c605ee52b20551c96da87da53698ef3ec58841791ffbba6840bebde1d31e00afbbbf01821eceb2c39bee8e51decf8cafbab0c06212c5b11fd2f247
-  data.tar.gz: 6e63e24b398aa950fe0a0228096eecd1797652c09828e5e17c01af37cdc42eca957725f8e4cfa0aa04eea1307cfe093e26f9935194d26129eda73f92d8cb56cb
+  metadata.gz: eb63631ceb917bfc4b6514db9bbf4da9cb0682eee9af7fab5b12ef045a16a09bbee18556c313739280778235bfaad7acee626e1a272e5f956ccc1bda19a4cea5
+  data.tar.gz: 5f842a8b143080d00c3134677277902ac88630ec01dd7a1ccf4ecae01fc162d3c7594a378a279b6168795597739ae312dc0342aeee3184b13caa4fb898802198

data/lib/sidekiq/ultimate/resurrector.rb

@@ -23,6 +23,9 @@ module Sidekiq
       LOCK_KEY = "#{MAIN_KEY}:lock"
       private_constant :LOCK_KEY
 
+      LAST_RUN_KEY = "#{MAIN_KEY}:last_run"
+      private_constant :LAST_RUN_KEY
+
       class << self
         def setup!
           @identity = Object.new.tap { |o| o.extend Sidekiq::Util }.identity
@@ -86,9 +89,18 @@ module Sidekiq
           end
         end
 
-        def lock(&block)
+        def lock
           Sidekiq.redis do |redis|
-            Redis::Lockers.acquire(redis, LOCK_KEY, :ttl => 30_000, &block)
+            Redis::Lockers.acquire(redis, LOCK_KEY, :ttl => 30_000) do
+              results  = redis.pipelined { |r| [r.time, r.get(LAST_RUN_KEY)] }
+              distance = results[0][0] - results[1].to_i
+
+              return unless 60 < distance
+
+              yield
+
+              redis.set(LAST_RUN_KEY, redis.time.first)
+            end
           end
         end
 

data/lib/sidekiq/ultimate/unit_of_work/requeue.lua

@@ -1,3 +1,7 @@
-redis.call(ARGV[1], KEYS[1], ARGV[2])
-redis.call("LREM", KEYS[2], -1, ARGV[2])
-return 1
+if 1 == redis.call("LREM", KEYS[2], -1, ARGV[2]) then
+  redis.call(ARGV[1], KEYS[1], ARGV[2])
+  return 1
+end
+
+return 0
+

data/lib/sidekiq/ultimate/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Ultimate
     # Gem version.
-    VERSION = "0.0.1.alpha.12"
+    VERSION = "0.0.1.alpha.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.12
+  version: 0.0.1.alpha.13
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby