sidekiq_alive 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6b5e84ff746dd5d962f51625919178bc7495308abda9f7a1115adc09604bdb
-  data.tar.gz: 0764a954ba5e287bfe0086229973582c2dd64ee8e053bd477215dbcbd419ee02
+  metadata.gz: cd90934747b7a9c1ca502f4ad44cdbd25e62477c01b7a3294f4b8c8e2779f27f
+  data.tar.gz: 0e05ab99ca8f24ed17209d6d31b37c5feb5202b899a540db550d892f810d65c0
 SHA512:
-  metadata.gz: ad276a94133bef97bfa64532d526f159253071d2ec0ee9447124ab64d10534e2aae634f31e0b390c68a92fb5d5aad544ac4b185c7ac8a74de582042322fbae2a
-  data.tar.gz: 20408e4c55d5fe5299d71ad7c1a81ebe550abce762875ca23b27b3d7ef40799d3859ff8cd33fda4a40d922c93552c2caaaadcf3d755778166ed8edd4dff5bfa0
+  metadata.gz: 3dd8df33e8a8d7055728f4f5a0a5e7a4622c5ea9a56480c0a0859e1c2b8ced78fa9a1dbd708ce98acbf8fc8ecbe396f3c8f64df08009d41c4d41243fe81763f5
+  data.tar.gz: e440b167ba6ac102eed86ee2f04273f093ed039e1110b055e0f6f6cefc75068dd0c96aad57fa657384f147a3e78f82b09dbd38357d9f9940fe228a2d0be914a6

data/lib/sidekiq_alive/redis/base.rb

@@ -7,7 +7,19 @@ module SidekiqAlive
         raise(NotImplementedError)
       end
 
-      def match(key)
+      def zadd(set_key, ex, key)
+        raise(NotImplementedError)
+      end
+
+      def zrange(set_key, start, stop)
+        raise(NotImplementedError)
+      end
+
+      def zrangebyscore(set_key, min, max)
+        raise(NotImplementedError)
+      end
+
+      def zrem(set_key, key)
         raise(NotImplementedError)
       end
 

data/lib/sidekiq_alive/redis/redis_client_gem.rb

@@ -15,8 +15,20 @@ module SidekiqAlive
         Sidekiq.redis { |redis| redis.call("GET", key) }
       end
 
-      def match(key)
-        Sidekiq.redis { |redis| 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)

data/lib/sidekiq_alive/redis/redis_gem.rb

@@ -15,16 +15,20 @@ module SidekiqAlive
         redis.get(key)
       end
 
-      def match(key)
-        keys = []
-        cursor = 0
-
-        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 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
+
+      def zrem(set_key, key)
+        redis.zrem(set_key, key)
       end
 
       def delete(key)

data/lib/sidekiq_alive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqAlive
-  VERSION = "2.2.2"
+  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.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 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.2/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: []