sidekiq_alive 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e582c78da2c8fa6ab33a00ff95b84cb118146e4e6bd91da9571812a29b362a
-  data.tar.gz: 1e05d528f28a1c73ce5b53bab77b32d5526a759f0e73a490c77606bcd9ea80ee
+  metadata.gz: cd90934747b7a9c1ca502f4ad44cdbd25e62477c01b7a3294f4b8c8e2779f27f
+  data.tar.gz: 0e05ab99ca8f24ed17209d6d31b37c5feb5202b899a540db550d892f810d65c0
 SHA512:
-  metadata.gz: d6cb33070d6b0ea67e4aee822f72bab2f00ef4fd1b930f52ab5f2a6450f146a64d5e4dff3e8c9aed662e5f1a82c32f71a08b70d40f817b297350b19779e016a5
-  data.tar.gz: 679728e07162ab19a31b9be42b75b430d466afaf76bb15cdfd6265092486ab17f7e1d5259d6467f9dc9eccb75c1d355b5bbb46712ccfec1b1ecad97c7a0bdf8f
+  metadata.gz: 3dd8df33e8a8d7055728f4f5a0a5e7a4622c5ea9a56480c0a0859e1c2b8ced78fa9a1dbd708ce98acbf8fc8ecbe396f3c8f64df08009d41c4d41243fe81763f5
+  data.tar.gz: e440b167ba6ac102eed86ee2f04273f093ed039e1110b055e0f6f6cefc75068dd0c96aad57fa657384f147a3e78f82b09dbd38357d9f9940fe228a2d0be914a6

data/lib/sidekiq_alive/redis/base.rb

@@ -7,22 +7,28 @@ module SidekiqAlive
         raise(NotImplementedError)
       end
 
-      def match(key)
+      def zadd(set_key, ex, key)
         raise(NotImplementedError)
       end
 
-      def delete(key)
+      def zrange(set_key, start, stop)
         raise(NotImplementedError)
       end
 
-      def ttl(...)
-        redis.ttl(...)
+      def zrangebyscore(set_key, min, max)
+        raise(NotImplementedError)
+      end
+
+      def zrem(set_key, key)
+        raise(NotImplementedError)
       end
 
-      private
+      def delete(key)
+        raise(NotImplementedError)
+      end
 
-      def redis
-        Sidekiq.redis { |r| r }
+      def ttl(...)
+        Sidekiq.redis { |redis| redis.ttl(...) }
       end
     end
   end

data/lib/sidekiq_alive/redis/redis_client_gem.rb

@@ -8,19 +8,31 @@ module SidekiqAlive
     # https://github.com/redis-rb/redis-client
     class RedisClientGem < Base
       def set(key, time:, ex:)
-        redis.call("SET", key, time, ex: ex)
+        Sidekiq.redis { |redis| redis.call("SET", key, time, ex: ex) }
       end
 
       def get(key)
-        redis.call("GET", key)
+        Sidekiq.redis { |redis| redis.call("GET", key) }
       end
 
-      def match(key)
-        redis.scan("MATCH", key).map { |key| key }
+      def zadd(set_key, ex, key)
+        Sidekiq.redis { |redis| redis.call("ZADD", set_key, ex, key) }
+      end
+
+      def zrange(set_key, start, stop)
+        Sidekiq.redis { |redis| redis.call("ZRANGE", set_key, start, stop) }
+      end
+
+      def zrangebyscore(set_key, min, max)
+        Sidekiq.redis { |redis| redis.call("ZRANGEBYSCORE", set_key, min, max) }
+      end
+
+      def zrem(set_key, key)
+        Sidekiq.redis { |redis| redis.call("ZREM", set_key, key) }
       end
 
       def delete(key)
-        redis.call("DEL", key)
+        Sidekiq.redis { |redis| redis.call("DEL", key) }
       end
     end
   end

data/lib/sidekiq_alive/redis/redis_gem.rb

@@ -15,21 +15,31 @@ module SidekiqAlive
         redis.get(key)
       end
 
-      def match(key)
-        keys = []
-        cursor = 0
+      def zadd(set_key, ex, key)
+        redis.zadd(set_key, ex, key)
+      end
+
+      def zrange(set_key, start, stop)
+        redis.zrange(set_key, start, stop)
+      end
+
+      def zrangebyscore(set_key, min, max)
+        redis.zrangebyscore(set_key, min, max)
+      end
 
-        loop do
-          cursor, found_keys = redis.scan(cursor, match: key, count: 1000)
-          keys += found_keys if found_keys
-          break if cursor.to_i == 0
-        end
-        keys
+      def zrem(set_key, key)
+        redis.zrem(set_key, key)
       end
 
       def delete(key)
         redis.del(key)
       end
+
+      private
+
+      def redis
+        Sidekiq.redis { |redis| redis }
+      end
     end
   end
 end

data/lib/sidekiq_alive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqAlive
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 end

data/lib/sidekiq_alive.rb

@@ -9,6 +9,7 @@ require "sidekiq_alive/helpers"
 require "sidekiq_alive/redis"
 
 module SidekiqAlive
+  HOSTNAME_REGISTRY = "sidekiq-alive-hostnames"
   class << self
     def start
       Sidekiq.configure_server do |sq_config|
@@ -28,6 +29,7 @@ module SidekiqAlive
           logger.info(startup_info)
 
           register_current_instance
+
           store_alive_key
           # Passing the hostname argument it's only for debugging enqueued jobs
           SidekiqAlive::Worker.perform_async(hostname)
@@ -63,11 +65,13 @@ module SidekiqAlive
       # Delete any pending jobs for this instance
       logger.info(shutdown_info)
       purge_pending_jobs
-      redis.delete(current_instance_register_key)
+      redis.zrem(HOSTNAME_REGISTRY, current_instance_register_key)
     end
 
     def registered_instances
-      redis.match("#{config.registered_instance_key}::*")
+      # before we return we make sure we expire old keys
+      expire_old_keys
+      redis.zrange(HOSTNAME_REGISTRY, 0, -1)
     end
 
     def purge_pending_jobs
@@ -136,6 +140,7 @@ module SidekiqAlive
         port: config.port,
         ttl: config.time_to_live,
         queue: current_queue,
+        register_set: HOSTNAME_REGISTRY,
         liveness_key: current_lifeness_key,
         register_key: current_instance_register_key,
       }
@@ -144,11 +149,21 @@ module SidekiqAlive
     end
 
     def successful_startup_text
-      "Successfully started sidekiq-alive, registered with key: #{current_instance_register_key}"
+      "Successfully started sidekiq-alive, registered with key: "\
+        "#{current_instance_register_key} on set #{HOSTNAME_REGISTRY}"
+    end
+
+    def expire_old_keys
+      # we get every key that should be expired by now
+      keys_to_expire = redis.zrangebyscore(HOSTNAME_REGISTRY, 0, Time.now.to_i)
+      # then we remove it
+      keys_to_expire.each { |key| redis.zrem(HOSTNAME_REGISTRY, key) }
     end
 
     def register_instance(instance_name)
-      redis.set(instance_name, time: Time.now.to_i, ex: config.registration_ttl.to_i)
+      expiration = Time.now.to_i + config.registration_ttl.to_i
+      redis.zadd(HOSTNAME_REGISTRY, expiration, instance_name)
+      expire_old_keys
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,7 +213,7 @@ metadata:
   homepage_uri: https://github.com/arturictus/sidekiq_alive
   source_code_uri: https://github.com/arturictus/sidekiq_alive
   changelog_uri: https://github.com/arturictus/sidekiq_alive/releases
-  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.2.1/README.md
+  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.2.3/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
 post_install_message: 
 rdoc_options: []