sidekiq_alive 2.1.9 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1531edeeb59ff8e59f1ea95bc3a9456b3893658254b1aa1dd9bd046b774914
-  data.tar.gz: 5c8fdbcd1c8ca43fb3e3b461d94049fdf27e8663ee9aafb8bfcac8761f96a6c7
+  metadata.gz: d2e582c78da2c8fa6ab33a00ff95b84cb118146e4e6bd91da9571812a29b362a
+  data.tar.gz: 1e05d528f28a1c73ce5b53bab77b32d5526a759f0e73a490c77606bcd9ea80ee
 SHA512:
-  metadata.gz: e5cb97906bd942c5c65b95537c75d1f39f77b7154845c2a6bd748e02b005d8103c76510eedb8e2676183c201cd21067e1f73fa7986681c858e6d8de477eac987
-  data.tar.gz: 2a581a73a2b9825681f3904d7d6d69af8faf10db1a117c037836f07a21c8b43931db6cfdb40bfaff5d6b27806b64b8d73e4c26c6951c0a1710245f4da3a7f3bf
+  metadata.gz: d6cb33070d6b0ea67e4aee822f72bab2f00ef4fd1b930f52ab5f2a6450f146a64d5e4dff3e8c9aed662e5f1a82c32f71a08b70d40f817b297350b19779e016a5
+  data.tar.gz: 679728e07162ab19a31b9be42b75b430d466afaf76bb15cdfd6265092486ab17f7e1d5259d6467f9dc9eccb75c1d355b5bbb46712ccfec1b1ecad97c7a0bdf8f

data/README.md

@@ -1,8 +1,10 @@
 # SidekiqAlive
 
-![build](https://github.com/arturictus/sidekiq_alive/actions/workflows/ruby.yml/badge.svg)
-[![Maintainability](https://api.codeclimate.com/v1/badges/35c39124564ffeb0ce4e/maintainability)](https://codeclimate.com/github/arturictus/sidekiq_alive/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/35c39124564ffeb0ce4e/test_coverage)](https://codeclimate.com/github/arturictus/sidekiq_alive/test_coverage)
+[![Gem Version](https://badge.fury.io/rb/sidekiq_alive.svg)](https://rubygems.org/gems/sidekiq_alive)
+[![Total Downloads](https://img.shields.io/gem/dt/sidekiq_alive?color=blue)](https://rubygems.org/gems/https://rubygems.org/gems/sidekiq_alive)
+![Workflow status](https://github.com/allure-framework/allure-ruby/workflows/Test/badge.svg)
+
+---
 
 SidekiqAlive offers a solution to add liveness probe for a Sidekiq instance deployed in Kubernetes.
 This library can be used to check sidekiq health outside kubernetes.
@@ -249,7 +251,7 @@ SidekiqAlive.setup do |config|
   # default: proc {}
   #
   #    config.shutdown_callback = proc do
-  #      Sidekiq::Queue.all.find { |q| q.name == "#{queue_prefix}-#{SidekiqAlive.hostname}" }&.clear
+  #      Sidekiq::Queue.all.find { |q| q.name == "#{config.queue_prefix}-#{SidekiqAlive.hostname}" }&.clear
   #    end
 
   # ==> Queue Prefix

data/lib/sidekiq_alive/config.rb

@@ -36,7 +36,7 @@ module SidekiqAlive
     end
 
     def registration_ttl
-      @registration_ttl || time_to_live + 60
+      @registration_ttl || time_to_live * 3
     end
   end
 end

data/lib/sidekiq_alive/redis/base.rb

@@ -3,26 +3,22 @@
 module SidekiqAlive
   module Redis
     class Base
-      def set(key, time:, ex:)
-        raise("Implement me")
+      def set(...)
+        raise(NotImplementedError)
       end
 
       def match(key)
-        raise("Implement me")
+        raise(NotImplementedError)
       end
 
       def delete(key)
-        raise("Implement me")
+        raise(NotImplementedError)
       end
 
       def ttl(...)
         redis.ttl(...)
       end
 
-      def flushall
-        redis.flushall
-      end
-
       private
 
       def redis

data/lib/sidekiq_alive/redis/{client_adapter.rb → redis_client_gem.rb}

@@ -4,13 +4,17 @@ require_relative "base"
 
 module SidekiqAlive
   module Redis
-    # Wrapper for redis client adapter used by sidekiq > 7
-    #
-    class ClientAdapter < Base
+    # Wrapper for `redis-client` gem used by `sidekiq` > 7
+    # https://github.com/redis-rb/redis-client
+    class RedisClientGem < Base
       def set(key, time:, ex:)
         redis.call("SET", key, time, ex: ex)
       end
 
+      def get(key)
+        redis.call("GET", key)
+      end
+
       def match(key)
         redis.scan("MATCH", key).map { |key| key }
       end

data/lib/sidekiq_alive/redis/{client.rb → redis_gem.rb}

@@ -4,13 +4,17 @@ require_relative "base"
 
 module SidekiqAlive
   module Redis
-    # Wrapper for redis client used by sidekiq < 7
-    #
-    class Client < Base
+    # Wrapper for `redis` gem used by sidekiq < 7
+    # https://github.com/redis/redis-rb
+    class RedisGem < Base
       def set(key, time:, ex:)
         redis.set(key, time, ex: ex)
       end
 
+      def get(key)
+        redis.get(key)
+      end
+
       def match(key)
         keys = []
         cursor = 0

data/lib/sidekiq_alive/redis.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SidekiqAlive
+  module Redis
+    class << self
+      def adapter
+        Helpers.sidekiq_7 ? Redis::RedisClientGem.new : Redis::RedisGem.new
+      end
+    end
+  end
+end
+
+require_relative "redis/base"
+require_relative "redis/redis_client_gem"
+require_relative "redis/redis_gem"

data/lib/sidekiq_alive/version.rb

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

data/lib/sidekiq_alive/worker.rb

@@ -5,6 +5,7 @@ module SidekiqAlive
     include Sidekiq::Worker
     sidekiq_options retry: false
 
+    # Passing the hostname argument it's only for debugging enqueued jobs
     def perform(_hostname = SidekiqAlive.hostname)
       # Checks if custom liveness probe passes should fail or return false
       return unless config.custom_liveness_probe.call
@@ -15,12 +16,6 @@ module SidekiqAlive
       self.class.perform_in(config.time_to_live / 2, current_hostname)
     end
 
-    def hostname_registered?(hostname)
-      SidekiqAlive.registered_instances.any? do |ri|
-        /#{hostname}/ =~ ri
-      end
-    end
-
     def write_living_probe
       # Write liveness probe
       SidekiqAlive.store_alive_key

data/lib/sidekiq_alive.rb

@@ -6,8 +6,7 @@ require "singleton"
 require "sidekiq_alive/version"
 require "sidekiq_alive/config"
 require "sidekiq_alive/helpers"
-require "sidekiq_alive/redis/client"
-require "sidekiq_alive/redis/client_adapter"
+require "sidekiq_alive/redis"
 
 module SidekiqAlive
   class << self
@@ -21,10 +20,16 @@ module SidekiqAlive
             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
+          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)
           @server_pid = fork { SidekiqAlive::Server.run! }
 
@@ -83,12 +88,16 @@ module SidekiqAlive
       "#{config.registered_instance_key}::#{hostname}"
     end
 
+    def current_instance_registered?
+      redis.get(current_instance_register_key)
+    end
+
     def store_alive_key
       redis.set(current_lifeness_key, time: Time.now.to_i, ex: config.time_to_live.to_i)
     end
 
     def redis
-      @redis ||= Helpers.sidekiq_7 ? Redis::ClientAdapter.new : Redis::Client.new
+      @redis ||= Redis.adapter
     end
 
     def alive?
@@ -135,7 +144,7 @@ module SidekiqAlive
     end
 
     def successful_startup_text
-      "Successfully started sidekiq-alive, registered instances: #{registered_instances.join("\n\s\s- ")}"
+      "Successfully started sidekiq-alive, registered with key: #{current_instance_register_key}"
     end
 
     def register_instance(instance_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +199,10 @@ files:
 - lib/sidekiq_alive.rb
 - lib/sidekiq_alive/config.rb
 - lib/sidekiq_alive/helpers.rb
+- lib/sidekiq_alive/redis.rb
 - lib/sidekiq_alive/redis/base.rb
-- lib/sidekiq_alive/redis/client.rb
-- lib/sidekiq_alive/redis/client_adapter.rb
+- lib/sidekiq_alive/redis/redis_client_gem.rb
+- lib/sidekiq_alive/redis/redis_gem.rb
 - lib/sidekiq_alive/server.rb
 - lib/sidekiq_alive/version.rb
 - lib/sidekiq_alive/worker.rb
@@ -212,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.1.9/README.md
+  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.2.1/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
 post_install_message: 
 rdoc_options: []