sidekiq_alive 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203a0459203c7e31aa2a223c7a6a2eea009f109697843b83eacd73577606487b
-  data.tar.gz: b85f281d7fc890744c303a51c46bdd846c3101e0acd44f3557a3549a00f25807
+  metadata.gz: 785267eeba9c94f17b29d9df50a17aaa787bfa32b321dc3c097c5d375fc68ef7
+  data.tar.gz: ace6c8c8b8285b3a4963db034a7ab439594adb4123db4957829ca81b3677c07b
 SHA512:
-  metadata.gz: e2ab4467ab2b6041c4858fd96b91e5172751b4f86af6d6f4846d8e1f86f158a0a3279153e5972e24636d46983f5811191ea83ed4993e18886fda99ff206bec26
-  data.tar.gz: 2fe20f2e4895506137ba6e4ec6afe3c544eab32eef4a9a31690db808f459e452012ed3646d69c24dec869a2519facc6d9909326af915fe723126b8e212960f5a
+  metadata.gz: 51c04d062e6e2bdbdb6bdbcd803024d642847c3a4fe46df673790cc76b1ce1916aae2f90069bc00fd727242b5956ae9646fb52fa227869a08065099a8a09cd95
+  data.tar.gz: 3afc2cd02f1b64e68e99e06a556c9c8aaafff5f717f9fd91370b70fb239834bfcf3626819e6e19a054e50ba29bf977503848e4a02aa306727c1b68b79c391815

data/lib/sidekiq_alive/config.rb

@@ -42,5 +42,9 @@ module SidekiqAlive
     def registration_ttl
       @registration_ttl || time_to_live * 3
     end
+
+    def worker_interval
+      time_to_live / 2
+    end
   end
 end

data/lib/sidekiq_alive/server/base.rb

@@ -4,7 +4,7 @@ module SidekiqAlive
   module Server
     module Base
       SHUTDOWN_SIGNAL = "TERM"
-      QUIET_SIGNAL = "USR1"
+      QUIET_SIGNAL = "TSTP"
 
       # set web server to quiet mode
       def quiet!

data/lib/sidekiq_alive/server/default.rb

@@ -72,7 +72,7 @@ module SidekiqAlive
       attr_reader :path
 
       def quiet?
-        @quiet && (@quiet - Time.now) < SidekiqAlive.config.quiet_timeout
+        @quiet && (Time.now - @quiet) < SidekiqAlive.config.quiet_timeout
       end
     end
   end

data/lib/sidekiq_alive/server/rack.rb

@@ -51,7 +51,7 @@ module SidekiqAlive
         private
 
         def quiet?
-          @quiet && (@quiet - Time.now) < SidekiqAlive.config.quiet_timeout
+          @quiet && (Time.now - @quiet) < SidekiqAlive.config.quiet_timeout
         end
 
         def handler

data/lib/sidekiq_alive/version.rb

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

data/lib/sidekiq_alive/worker.rb

@@ -12,8 +12,9 @@ module SidekiqAlive
 
       # Writes the liveness in Redis
       write_living_probe
+      remove_orphaned_queues
       # schedules next living probe
-      self.class.perform_in(config.time_to_live / 2, current_hostname)
+      self.class.perform_in(config.worker_interval, current_hostname)
     end
 
     def write_living_probe
@@ -29,6 +30,17 @@ module SidekiqAlive
       end
     end
 
+    # Removes orphaned Sidekiq queues left behind by unexpected instance shutdowns (e.g., due to OOM)
+    def remove_orphaned_queues
+      # If the worker isn't executed within this window, the lifeness key expires
+      latency_threshold = config.time_to_live - config.worker_interval
+      Sidekiq::Queue.all
+        .filter { |q| q.name.start_with?(config.queue_prefix.to_s) }
+        .filter { |q| q.latency > latency_threshold }
+        .filter { |q| q.size == 1 && q.all? { |job| job.klass == self.class.name } }
+        .each(&:clear)
+    end
+
     def current_hostname
       SidekiqAlive.hostname
     end

data/lib/sidekiq_alive.rb

@@ -148,7 +148,7 @@ module SidekiqAlive
     end
 
     def successful_startup_text
-      "Successfully started sidekiq-alive, registered with key: "\
+      "Successfully started sidekiq-alive, registered with key: " \
         "#{current_instance_register_key} on set #{HOSTNAME_REGISTRY}"
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Andrejs Cunskis
 - Artur Pañach
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +95,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: semver2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: gserver
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +146,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,7 +156,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 description: |
   SidekiqAlive offers a solution to add liveness probe of a Sidekiq instance.
 
@@ -183,9 +197,9 @@ 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.4.0/README.md
+  documentation_uri: https://github.com/arturictus/sidekiq_alive/blob/v2.5.0/README.md
   bug_tracker_uri: https://github.com/arturictus/sidekiq_alive/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,15 +207,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Liveness probe for sidekiq on Kubernetes deployments.
 test_files: []