sidekiq_alive 2.2.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd90934747b7a9c1ca502f4ad44cdbd25e62477c01b7a3294f4b8c8e2779f27f
-  data.tar.gz: 0e05ab99ca8f24ed17209d6d31b37c5feb5202b899a540db550d892f810d65c0
+  metadata.gz: 63e0e0239c3b38ded118c8bd79cfda8e45417b7be5aa4c3b19243bfc8490ddc3
+  data.tar.gz: e263a81dd897da3db9f5a84a79cab8353027e689da700b8871c1226ee68d8da5
 SHA512:
-  metadata.gz: 3dd8df33e8a8d7055728f4f5a0a5e7a4622c5ea9a56480c0a0859e1c2b8ced78fa9a1dbd708ce98acbf8fc8ecbe396f3c8f64df08009d41c4d41243fe81763f5
-  data.tar.gz: e440b167ba6ac102eed86ee2f04273f093ed039e1110b055e0f6f6cefc75068dd0c96aad57fa657384f147a3e78f82b09dbd38357d9f9940fe228a2d0be914a6
+  metadata.gz: 88782bc7948ceeadc8ee7b2cb8c06cc9c5021da5891e4f333d620c5769a87c120d140cb1374c8886f3881b2c9019ff1855eb4710a838b085adbcc9f8681e3673
+  data.tar.gz: ce6c00b601cc2304568857c7d252a6a7b19693d7e71e6ad7c39f1381b99f8e010cbba91a1195bf073b1381ce0fc3d13cb6c1a736a21e8295fb2291fd485060fb

data/README.md

@@ -268,6 +268,14 @@ SidekiqAlive.setup do |config|
   # default: 'webrick'
   #
   #    config.server = 'puma'
+
+  # ==> Concurrency
+  # The maximum number of Redis connections requested for the SidekiqAlive pool.
+  # Can also be set with the environment variable SIDEKIQ_ALIVE_CONCURRENCY.
+  # NOTE: only effects Sidekiq 7 or greater.
+  # default: 2
+  #
+  #    config.concurrency = 3
 end
 ```
 

data/lib/sidekiq_alive/config.rb

@@ -15,7 +15,8 @@ module SidekiqAlive
                   :server,
                   :custom_liveness_probe,
                   :logger,
-                  :shutdown_callback
+                  :shutdown_callback,
+                  :concurrency
 
     def initialize
       set_defaults
@@ -33,6 +34,7 @@ module SidekiqAlive
       @server = ENV.fetch("SIDEKIQ_ALIVE_SERVER", "webrick")
       @custom_liveness_probe = proc { true }
       @shutdown_callback = proc {}
+      @concurrency = Integer(ENV.fetch("SIDEKIQ_ALIVE_CONCURRENCY", 2), exception: false) || 2
     end
 
     def registration_ttl

data/lib/sidekiq_alive/redis/base.rb

@@ -28,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,32 +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)
-        Sidekiq.redis { |redis| redis.call("ZADD", set_key, ex, key) }
+        redis { |r| r.call("ZADD", set_key, ex, key) }
       end
 
       def zrange(set_key, start, stop)
-        Sidekiq.redis { |redis| redis.call("ZRANGE", set_key, start, stop) }
+        redis { |r| r.call("ZRANGE", set_key, start, stop) }
       end
 
       def zrangebyscore(set_key, min, max)
-        Sidekiq.redis { |redis| redis.call("ZRANGEBYSCORE", set_key, min, max) }
+        redis { |r| r.call("ZRANGEBYSCORE", set_key, min, max) }
       end
 
       def zrem(set_key, key)
-        Sidekiq.redis { |redis| redis.call("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,37 +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 zadd(set_key, ex, key)
-        redis.zadd(set_key, ex, key)
+        redis { |r| r.zadd(set_key, ex, key) }
       end
 
       def zrange(set_key, start, stop)
-        redis.zrange(set_key, start, stop)
+        redis { |r| r.zrange(set_key, start, stop) }
       end
 
       def zrangebyscore(set_key, min, max)
-        redis.zrangebyscore(set_key, min, max)
+        redis { |r| r.zrangebyscore(set_key, min, max) }
       end
 
       def zrem(set_key, key)
-        redis.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.3"
+  VERSION = "2.3.1"
 end

data/lib/sidekiq_alive.rb

@@ -10,20 +10,21 @@ 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 = config.concurrency
+              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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.1
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-10-17 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.3/README.md
+  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.3.1/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
 post_install_message: 
 rdoc_options: []