sidekiq-alive-next 2.2.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2262ac5bd03e54f13b80361452b90a306b61e0058f1496bf4d73d5f8a41593f9
-  data.tar.gz: 32a79905ca77cdf401828c8ea0ba9e5067c97b487c52d54ef8912716f005ab74
+  metadata.gz: a18bb6defb7f2d0d3eb1e1b01ce12b683c5c634be2e43b74600b787cdf4ae0e9
+  data.tar.gz: d0bb5d30eeee984dee67e75228d5d6ca3df91301eea805414dee6665dd058859
 SHA512:
-  metadata.gz: edc3042d9d3655ee8caec0f0c4207f78f102a2aae7a9c719f3bab8d9e6f4786c7550b7aaedf9b400d147af87e7ae9a5dfdd6db89998531a6377180ff0d2becc8
-  data.tar.gz: 2df4f3673588024031eafcb03095233cc4efa66263fc9fb98e7d9a76191ebb4648b468a105594c0ec148031748f817469918fa68195aa73e6b6a0f83961ba5b2
+  metadata.gz: 15cbeff2addefafddb0416fc194d5943d190bf03d1482b57a7b09771c72edaf015cee7ea55b23a055a775526b5a55b854c5251f27835839339e1d31a996f0523
+  data.tar.gz: 2c6e9f7aae03381045cc0b641b8caaff01ac6d8b51932f902e1578a6923e2ec62c4b1c4c6e9d6c54183a64fd56e0d2f766d26c99fd832f8c60b3fb5394f6babb

data/README.md

@@ -1,5 +1,10 @@
 # SidekiqAlive
 
+[![Gem Version](https://badge.fury.io/rb/sidekiq-alive-next.svg)](https://rubygems.org/gems/sidekiq-alive-next)
+[![Total Downloads](https://img.shields.io/gem/dt/sidekiq-alive-next?color=blue)](https://rubygems.org/gems/https://rubygems.org/gems/sidekiq-alive-next)
+![Workflow status](https://github.com/allure-framework/allure-ruby/workflows/Test/badge.svg)
+[![Known Vulnerabilities](https://snyk.io/test/github/andrcuns/sidekiq-alive/badge.svg)](https://snyk.io/test/github/andrcuns/sidekiq-alive)
+
 **This is the fork of 'arturictus/sidekiq_alive' with a few minor fixes and tweaks, all credit goes to author of original repo**
 
 SidekiqAlive offers a solution to add liveness probe for a Sidekiq instance deployed in Kubernetes.
@@ -277,7 +282,7 @@ Here is an example [rails app](https://github.com/arturictus/sidekiq_alive_examp
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/arturictus/sidekiq_alive. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/andrcuns/sidekiq-alive. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/sidekiq-alive-next.rb

@@ -14,7 +14,7 @@ module SidekiqAlive
       Sidekiq.configure_server do |sq_config|
         sq_config.on(:startup) do
           SidekiqAlive::Worker.sidekiq_options(queue: current_queue)
-          (sq_config.respond_to?(:[]) ? sq_config[:queues] : sq_config.options[:queues]).unshift(current_queue)
+          sq_config.queues.unshift(current_queue)
 
           logger.info(startup_info)
 
@@ -53,29 +53,18 @@ module SidekiqAlive
       # Delete any pending jobs for this instance
       logger.info(shutdown_info)
       purge_pending_jobs
-      redis.del(current_instance_register_key)
+      redis.call("DEL", current_instance_register_key)
     end
 
     def registered_instances
-      deep_scan("#{config.registered_instance_key}::*")
-    end
-
-    def deep_scan(keyword, keys = [], cursor = 0)
-      loop do
-        cursor, found_keys = SidekiqAlive.redis.scan(cursor, match: keyword, count: 1000)
-        keys += found_keys
-        break if cursor.to_i.zero?
-      end
-      keys
+      redis.scan("MATCH", "#{config.registered_instance_key}::*").map { |key| key }
     end
 
     def purge_pending_jobs
-      # TODO: Sidekiq 6 allows better way to find scheduled jobs
-      # https://github.com/mperham/sidekiq/wiki/API#scan
-      scheduled_set = Sidekiq::ScheduledSet.new
-      jobs = scheduled_set.select { |job| job.klass == "SidekiqAlive::Worker" && job.queue == current_queue }
+      jobs = Sidekiq::ScheduledSet.new.scan('"class":"SidekiqAlive::Worker"')
       logger.info("[SidekiqAlive] Purging #{jobs.count} pending for #{hostname}")
       jobs.each(&:delete)
+
       logger.info("[SidekiqAlive] Removing queue #{current_queue}")
       Sidekiq::Queue.new(current_queue).clear
     end
@@ -85,9 +74,7 @@ module SidekiqAlive
     end
 
     def store_alive_key
-      redis.set(current_lifeness_key,
-                Time.now.to_i,
-                ex: config.time_to_live.to_i)
+      redis.call("SET", current_lifeness_key, Time.now.to_i, ex: config.time_to_live.to_i)
     end
 
     def redis
@@ -130,6 +117,8 @@ module SidekiqAlive
         port: config.port,
         ttl: config.time_to_live,
         queue: current_queue,
+        liveness_key: current_lifeness_key,
+        register_key: current_instance_register_key,
       }
 
       "Starting sidekiq-alive: #{info}"
@@ -140,9 +129,9 @@ module SidekiqAlive
     end
 
     def register_instance(instance_name)
-      redis.set(instance_name, Time.now.to_i, ex: config.registration_ttl.to_i)
+      redis.call("SET", instance_name, Time.now.to_i, ex: config.registration_ttl.to_i)
     end
-end
+  end
 end
 
 require "sidekiq_alive/worker"

data/lib/sidekiq_alive/server.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require "rack"
+require "rackup"
 
 module SidekiqAlive
   class Server
     class << self
       def run!
-        handler = Rack::Handler.get(server)
+        handler = Rackup::Handler.get(server)
 
         Signal.trap("TERM") { handler.shutdown }
 

data/lib/sidekiq_alive/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-alive-next
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Andrejs Cunskis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,33 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: mock_redis
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -124,25 +124,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.47.2
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
     - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +227,7 @@ metadata:
   homepage_uri: https://github.com/andrcuns/sidekiq-alive
   source_code_uri: https://github.com/andrcuns/sidekiq-alive
   changelog_uri: https://github.com/andrcuns/sidekiq-alive/releases
-  documentation_uri: https://github.com/andrcuns/sidekiq-alive/blob/v2.2.1/README.md
+  documentation_uri: https://github.com/andrcuns/sidekiq-alive/blob/v3.1.0/README.md
   bug_tracker_uri: https://github.com/andrcuns/sidekiq-alive/issues
 post_install_message: 
 rdoc_options: []