sidekiq-ultimate 0.0.1.alpha.6 → 0.0.1.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93e1eaff50e0499819b57d210931b829eaf89c6843ddfeeb3a027a8e3291908f
-  data.tar.gz: 6071458dd821cda0e00891af04801841a62b52e0aea2b4e1523d93b4345fbffe
+  metadata.gz: 375ce3e7bcb160856a1451a4eaaae01d7e79c431f1d2459d01d0aeea9a124ee7
+  data.tar.gz: febd4e1cd0ab0b069090069e819ede9eb9b90dc7038db3574bc34e5534a6ba69
 SHA512:
-  metadata.gz: 29e14a9eea62466ca4212f25b475424c864f70146996c7518a0c8115d56d5f8f5c6547af38176e20def8391f10cecb83715363df5f62d2228e68b4854dd5cd1e
-  data.tar.gz: 9aeaf41ebc64f0e3bfa181e8acaaf34e775f0fa47ef58ce71ab81a9917b8681fbdd3db93b75e99a50063381a61cf3b4077d0f0aeb1fb06e259f69f924329e3d5
+  metadata.gz: e077fcbbdd5d1a5e7963024935f415bd1e64ec0bf9b2a61b98eed5a3a1c7cf7494e4d06ea687bee130d85b639c81190985d055d81280de4dbeb718abb684cf4a
+  data.tar.gz: 8a563c02d6dc94eb5554dd0c97bdd2d318fe1890d0cbafc6e227cbca87f2d339351ddea5cdeb30d4f6af7364ab0d70b0203edd28abce08e50de89912af6ce170

data/lib/sidekiq/ultimate/resurrector.rb

@@ -51,14 +51,14 @@ module Sidekiq
         def resurrect!
           lock do
             casualties.each do |identity|
-              Sidekiq.logger.debug { "[#{self}] Resurrecting #{identity}" }
+              log(:debug) { "Resurrecting #{identity}" }
 
               queues = queues_of(identity).each { |queue| resurrect(queue) }
               cleanup(identity, queues.map(&:inproc))
             end
           end
         rescue => e
-          Sidekiq.logger.error("#{self}.resurrect! failed: #{e}")
+          log(:error) { "Resurrection failed: #{e}" }
           raise
         end
 
@@ -66,6 +66,8 @@ module Sidekiq
 
         def defibrillate!
           Sidekiq.redis do |redis|
+            log(:debug) { "Defibrillating" }
+
             queues = JSON.dump(Sidekiq.options[:queues].uniq)
             redis.hset(MAIN_KEY, @identity, queues)
           end
@@ -103,24 +105,30 @@ module Sidekiq
 
         def resurrect(queue)
           Sidekiq.redis do |redis|
-            count = RESURRECT.eval(redis, {
+            result = RESURRECT.eval(redis, {
               :keys => [queue.inproc, queue.pending]
             })
 
-            if count.positive?
-              Sidekiq.logger.info do
-                "[#{self}] Resurrected #{count} jobs of #{queue.inspect}"
-              end
+            if result.positive?
+              log(:info) { "Resurrected #{result} jobs from #{queue.inproc}" }
             end
           end
         end
 
         def cleanup(identity, inprocs)
           Sidekiq.redis do |redis|
-            SAFECLEAN.eval(redis, {
+            result = SAFECLEAN.eval(redis, {
               :keys => [MAIN_KEY, *inprocs],
               :argv => [identity]
             })
+
+            log(:debug) { "Safeclean of #{identity} ok=#{1 == result}" }
+          end
+        end
+
+        def log(level)
+          Sidekiq.logger.public_send(level) do
+            "[#{self}] @#{@identity} #{yield}"
           end
         end
       end

data/lib/sidekiq/ultimate/resurrector/safeclean.lua

@@ -12,4 +12,7 @@ end
 
 if rip then
   redis.call("HDEL", KEYS[1], ARGV[1])
+  return 1
 end
+
+return nil

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

@@ -1,2 +1,3 @@
 redis.call(ARGV[1], KEYS[1], ARGV[2])
 redis.call("LREM", KEYS[2], -1, ARGV[2])
+return 1

data/lib/sidekiq/ultimate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.6
+  version: 0.0.1.alpha.7
 platform: ruby
 authors:
 - Alexey Zapparov