sidekiq_alive 2.1.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '070807205b4f9046f51b90908873679c0cd716d1beff188b8d9f275b18f77594'
-  data.tar.gz: 60b050e4a93a3e98602e96c221b50e2398f7d40e2d7358c3c80429f59d0830fb
+  metadata.gz: d778567938366cd3b85b6ccf88d43976b3e237a2d36546e0d4167cf6d04a61a8
+  data.tar.gz: 0dba8bfaf120451d8fed00ab53466a6b0d2101b64197acb64b562f7e28fef0d0
 SHA512:
-  metadata.gz: cb15f99935b3ef0f0c4bc297e07d741b3f0bd3dbefbe72a19cfcc512098117317405f54372adfc10577a233f9e70c05ad8288ec1a6c1323e5499214dc3888132
-  data.tar.gz: b99e019282d2b9313b1ccd32cd151da5ebfc1ba30f2c335b03de16e38689d412fa48f6c60fb70b453a65fb97faa1c1867fdf733603d7e46b7547966f1cd26889
+  metadata.gz: 8e4bf799b9a576190e7893876985540d381920e973756db23fae0a202b9c219ba9c3084e74a92edd6e5ef449b3071781d4596dd08ceeff4904ec377942693bd8
+  data.tar.gz: ecdac1cc02ab0114db9d2328012e813aa304f2d9f64f58cfc60565d67ab0eb8d0cdd7fc93b4f7bf10f3f72f3f3b7b59a8a8bd4a0f32c3ccc256ced3f4c3e9bda

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.

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.8"
+  VERSION = "2.2.0"
 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
@@ -25,6 +24,7 @@ module SidekiqAlive
 
           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! }
 
@@ -70,7 +70,7 @@ module SidekiqAlive
       jobs = if Helpers.sidekiq_5
         schedule_set.select { |job| job.klass == "SidekiqAlive::Worker" && job.queue == current_queue }
       else
-        schedule_set.scan('"class":"SidekiqAlive::Worker"')
+        schedule_set.scan('"class":"SidekiqAlive::Worker"').select { |job| job.queue == current_queue }
       end
       logger.info("[SidekiqAlive] Purging #{jobs.count} pending for #{hostname}")
       jobs.each(&:delete)
@@ -83,12 +83,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 +139,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.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.8/README.md
+  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.2.0/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
 post_install_message: 
 rdoc_options: []