sidekiq_alive 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6b5e84ff746dd5d962f51625919178bc7495308abda9f7a1115adc09604bdb
-  data.tar.gz: 0764a954ba5e287bfe0086229973582c2dd64ee8e053bd477215dbcbd419ee02
+  metadata.gz: 562294aa960a1c1cd11b0a020b0f7cce26f09ee4c2faeb7044e21fd9bf3be8c5
+  data.tar.gz: c31918f4c756cc551a3dcab2ea0d2c781c394e23e463c0a2c72ae68bfb52cd16
 SHA512:
-  metadata.gz: ad276a94133bef97bfa64532d526f159253071d2ec0ee9447124ab64d10534e2aae634f31e0b390c68a92fb5d5aad544ac4b185c7ac8a74de582042322fbae2a
-  data.tar.gz: 20408e4c55d5fe5299d71ad7c1a81ebe550abce762875ca23b27b3d7ef40799d3859ff8cd33fda4a40d922c93552c2caaaadcf3d755778166ed8edd4dff5bfa0
+  metadata.gz: 595baafc8b0499bb8f900cdaf3eac250d623ba3b51d65b4510d311b2913b1e0560fc967c63dbeaf9145cab43527a5d133b7af6127492103e0caf8538b61ed55e
+  data.tar.gz: 05deade6b05eb839fb0c6d1c0d08768b2141cc24c61cdd2edc1aa453338b12bc7b5bce3a8d19692968a7f85939541519fb6c70eb759273c1b2fe5afffce8b413

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
 
@@ -16,7 +28,7 @@ module SidekiqAlive
       end
 
       def ttl(...)
-        Sidekiq.redis { |redis| redis.ttl(...) }
+        redis { |r| r.ttl(...) }
       end
     end
   end

data/lib/sidekiq_alive/redis/redis_client_gem.rb

@@ -7,20 +7,45 @@ module SidekiqAlive
     # Wrapper for `redis-client` gem used by `sidekiq` > 7
     # https://github.com/redis-rb/redis-client
     class RedisClientGem < Base
+      def initialize
+        super
+
+        @capsule = Sidekiq.default_configuration.capsules[CAPSULE_NAME]
+      end
+
       def set(key, time:, ex:)
-        Sidekiq.redis { |redis| redis.call("SET", key, time, ex: ex) }
+        redis { |r| r.call("SET", key, time, ex: ex) }
       end
 
       def get(key)
-        Sidekiq.redis { |redis| redis.call("GET", key) }
+        redis { |r| r.call("GET", key) }
+      end
+
+      def zadd(set_key, ex, key)
+        redis { |r| r.call("ZADD", set_key, ex, key) }
+      end
+
+      def zrange(set_key, start, stop)
+        redis { |r| r.call("ZRANGE", set_key, start, stop) }
+      end
+
+      def zrangebyscore(set_key, min, max)
+        redis { |r| r.call("ZRANGEBYSCORE", set_key, min, max) }
       end
 
-      def match(key)
-        Sidekiq.redis { |redis| redis.scan("MATCH", key).map { |key| key } }
+      def zrem(set_key, key)
+        redis { |r| r.call("ZREM", set_key, key) }
       end
 
       def delete(key)
-        Sidekiq.redis { |redis| redis.call("DEL", key) }
+        redis { |r| r.call("DEL", key) }
+      end
+
+      private
+
+      def redis(&block)
+        # Default to Sidekiq.redis if capsule is not configured yet but redis adapter is accessed
+        (@capsule || Sidekiq).redis(&block)
       end
     end
   end

data/lib/sidekiq_alive/redis/redis_gem.rb

@@ -8,33 +8,37 @@ module SidekiqAlive
     # https://github.com/redis/redis-rb
     class RedisGem < Base
       def set(key, time:, ex:)
-        redis.set(key, time, ex: ex)
+        redis { |r| r.set(key, time, ex: ex) }
       end
 
       def get(key)
-        redis.get(key)
+        redis { |r| r.get(key) }
       end
 
-      def match(key)
-        keys = []
-        cursor = 0
+      def zadd(set_key, ex, key)
+        redis { |r| r.zadd(set_key, ex, key) }
+      end
+
+      def zrange(set_key, start, stop)
+        redis { |r| r.zrange(set_key, start, stop) }
+      end
+
+      def zrangebyscore(set_key, min, max)
+        redis { |r| r.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 { |r| r.zrem(set_key, key) }
       end
 
       def delete(key)
-        redis.del(key)
+        redis { |r| r.del(key) }
       end
 
       private
 
-      def redis
-        Sidekiq.redis { |redis| redis }
+      def redis(&block)
+        Sidekiq.redis(&block)
       end
     end
   end

data/lib/sidekiq_alive/version.rb

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

data/lib/sidekiq_alive.rb

@@ -9,25 +9,28 @@ require "sidekiq_alive/helpers"
 require "sidekiq_alive/redis"
 
 module SidekiqAlive
+  HOSTNAME_REGISTRY = "sidekiq-alive-hostnames"
+  CAPSULE_NAME = "sidekiq-alive"
+
   class << self
     def start
       Sidekiq.configure_server do |sq_config|
         sq_config.on(:startup) do
           SidekiqAlive::Worker.sidekiq_options(queue: current_queue)
-          if Helpers.sidekiq_7
-            sq_config.queues
-          else
-            sq_config.respond_to?(:[]) ? sq_config[:queues] : sq_config.options[:queues]
-          end.unshift(current_queue)
 
-          # If no weight is set, webui might not show this queue for given instance/process.
           if Helpers.sidekiq_7
-            sq_config.default_capsule.weights[current_queue] = 1
+            sq_config.capsule(CAPSULE_NAME) do |cap|
+              cap.concurrency = 2
+              cap.queues = [current_queue]
+            end
+          else
+            (sq_config.respond_to?(:[]) ? sq_config[:queues] : sq_config.options[:queues]).unshift(current_queue)
           end
 
           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 +66,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 +141,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 +150,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.3.0
 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-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
@@ -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.3.0/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
 post_install_message: 
 rdoc_options: []