sidekiq_alive 2.0.0 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364bf320e50acf4acacc6b092ddc878e094762a048f03b8496b03dca50c79c67
-  data.tar.gz: a19db126856fbb3629994f2d0aec3fd839462c204a62abe03e0833f140fb16f5
+  metadata.gz: e6d5a90f1ac023c49440e1e24d53e05bd3fe1f5362822e125a8989981e51846e
+  data.tar.gz: dd90cc1b6d7b1fc6273426e32f950d68a71eaa7d63b42b32d914450f35eec09a
 SHA512:
-  metadata.gz: c23f150276af1a182dc6dd7eef752125f12c65de9479ca9877294e0344dd02c9b49cd4174ebbb593996ab8937d538ef5a9b446eed19d5667b6462335d97e5e3a
-  data.tar.gz: 251ddc155702aa38adcd7368f5dd7e55c9fc40558a2e90fcd05d8641e78faa40337060deef492c23e602884250c6e66dfed1a77c46e058149658975e1e858543
+  metadata.gz: 533ef08f31e90ac4743577c561f3994c2b2e7eb9945cadcc4dc70dda3e2b339d8d8e6ab2d270b82a65dc884812b8d30ce1de49e50648af1a4136eafa77ee9dd3
+  data.tar.gz: 702c96b61ecaa7595b44ff9bd3dcfa29d58e99623a5fcd5534b94221dd92e96b06e0e81f217c826f7d8ee9e75bee55ef063d93ff855381efa5ead8af96a01cc4

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in sidekiq_alive.gemspec
 gemspec

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    sidekiq_alive (2.0.0)
+    sidekiq_alive (2.0.5)
       sidekiq
-      sinatra
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +12,6 @@ GEM
     diff-lcs (1.3)
     method_source (0.9.2)
     mock_redis (0.19.0)
-    mustermann (1.0.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -45,12 +43,6 @@ GEM
       rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
-      tilt (~> 2.0)
-    tilt (2.0.9)
 
 PLATFORMS
   ruby

data/README.md

@@ -11,7 +11,7 @@ __How?__
 
 A http server is started and on each requests validates that a liveness key is stored in Redis. If it is there means is working.
 
-A Sidekiq worker is the responsable to storing this key. If Sidekiq stops processing workers
+A Sidekiq worker is the responsible to storing this key. If Sidekiq stops processing workers
 this key gets expired by Redis an consequently the http server will return a 500 error.
 
 This worker is responsible to requeue itself for the next liveness probe.
@@ -65,7 +65,7 @@ bundle exec sidekiq
 
 ```
 curl localhost:7433
-#=> Alive!                                   
+#=> Alive!
 ```
 
 
@@ -83,6 +83,8 @@ Set `livenessProbe` in your Kubernetes deployment
 
 example with recommended setup:
 
+#### Sidekiq < 6
+
 ```yaml
 spec:
   containers:
@@ -117,6 +119,63 @@ spec:
   terminationGracePeriodSeconds: 60 # put your longest Job time here plus security time.
 ```
 
+#### Sidekiq >= 6
+
+Create file:
+
+_kube/sidekiq_quiet_
+
+```bash
+#!/bin/bash
+
+# Find Pid
+SIDEKIQ_PID=$(ps aux | grep sidekiq | grep busy | awk '{ print $2 }')
+# Send TSTP signal
+kill -SIGTSTP $SIDEKIQ_PID
+```
+
+Make it executable:
+
+```
+$ chmod +x kube/sidekiq_quiet
+```
+
+Execute it in your deployment preStop:
+
+```yaml
+spec:
+  containers:
+    - name: my_app
+      image: my_app:latest
+      env:
+        - name: RAILS_ENV
+          value: production
+      command:
+        - bundle
+        - exec
+        - sidekiq
+      ports:
+        - containerPort: 7433
+      livenessProbe:
+        httpGet:
+          path: /
+          port: 7433
+        initialDelaySeconds: 80 # app specific. Time your sidekiq takes to start processing.
+        timeoutSeconds: 5 # can be much less
+      readinessProbe:
+        httpGet:
+          path: /
+          port: 7433
+        initialDelaySeconds: 80 # app specific
+        timeoutSeconds: 5 # can be much less
+      lifecycle:
+        preStop:
+          exec:
+            # SIGTERM triggers a quick exit; gracefully terminate instead
+            command: ["kube/sidekiq_quiet"]
+  terminationGracePeriodSeconds: 60 # put your longest Job time here plus security time.
+```
+
 ### Outside kubernetes
 
 It's just up to you how you want to use it.
@@ -137,12 +196,27 @@ curl localhost:7433
 
 ```ruby
 SidekiqAlive.setup do |config|
+  # ==> Server host
+  # Host to bind the server.
+  # Can also be set with the environment variable SIDEKIQ_ALIVE_HOST.
+  # default: 0.0.0.0
+  #
+  #   config.host = 0.0.0.0
+
   # ==> Server port
-  # Port to bind the server
+  # Port to bind the server.
+  # Can also be set with the environment variable SIDEKIQ_ALIVE_PORT.
   # default: 7433
   #
   #   config.port = 7433
 
+  # ==> Server path
+  # HTTP path to respond to.
+  # Can also be set with the environment variable SIDEKIQ_ALIVE_PATH.
+  # default: '/'
+  #
+  #   config.path = '/'
+
   # ==> Liveness key
   # Key to be stored in Redis as probe of liveness
   # default: "SIDEKIQ::LIVENESS_PROBE_TIMESTAMP"
@@ -168,11 +242,17 @@ SidekiqAlive.setup do |config|
   # ==> Queue Prefix
   # SidekiqAlive will run in a independent queue for each instance/replica
   # This queue name will be generated with: "#{queue_prefix}-#{hostname}.
-  # You can customize the prefix here. 
+  # You can customize the prefix here.
   # default: :sidekiq_alive
   #
   #    config.queue_prefix = :other
 
+  # ==> Rack server
+  # Web server used to serve an HTTP response.
+  # Can also be set with the environment variable SIDEKIQ_ALIVE_SERVER.
+  # default: 'webrick'
+  #
+  #    config.server = 'puma'
 end
 ```
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "sidekiq_alive"
+require 'bundler/setup'
+require 'sidekiq_alive'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "sidekiq_alive"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/sidekiq_alive.rb

@@ -9,7 +9,7 @@ module SidekiqAlive
     SidekiqAlive::Worker.sidekiq_options queue: current_queue
     Sidekiq.configure_server do |sq_config|
 
-      sq_config.options[:queues] << current_queue
+      sq_config.options[:queues].unshift(current_queue)
 
       sq_config.on(:startup) do
         SidekiqAlive.tap do |sa|
@@ -27,6 +27,7 @@ module SidekiqAlive
       sq_config.on(:quiet) do
         SidekiqAlive.unregister_current_instance
       end
+
       sq_config.on(:shutdown) do
         Process.kill('TERM', @server_pid) unless @server_pid.nil?
         Process.wait(@server_pid) unless @server_pid.nil?

data/lib/sidekiq_alive/config.rb

@@ -1,29 +1,37 @@
+# frozen_string_literal: true
+
 module SidekiqAlive
   class Config
     include Singleton
 
-    attr_accessor :port,
+    attr_accessor :host,
+                  :port,
+                  :path,
                   :liveness_key,
                   :time_to_live,
                   :callback,
                   :registered_instance_key,
-                  :queue_prefix
+                  :queue_prefix,
+                  :server
 
     def initialize
       set_defaults
     end
 
     def set_defaults
+      @host = ENV['SIDEKIQ_ALIVE_HOST'] || '0.0.0.0'
       @port = ENV['SIDEKIQ_ALIVE_PORT'] || 7433
+      @path = ENV['SIDEKIQ_ALIVE_PATH'] || '/'
       @liveness_key = 'SIDEKIQ::LIVENESS_PROBE_TIMESTAMP'
       @time_to_live = 10 * 60
       @callback = proc {}
       @registered_instance_key = 'SIDEKIQ_REGISTERED_INSTANCE'
       @queue_prefix = :sidekiq_alive
+      @server = ENV['SIDEKIQ_ALIVE_SERVER'] || 'webrick'
     end
 
     def registration_ttl
-      @registration_ttl ? @registration_ttl : time_to_live + 60
+      @registration_ttl || time_to_live + 60
     end
   end
 end

data/lib/sidekiq_alive/server.rb

@@ -1,18 +1,44 @@
-require 'sinatra/base'
+# frozen_string_literal: true
+
+require 'rack'
+
 module SidekiqAlive
-  class Server < Sinatra::Base
-    set :bind, '0.0.0.0'
-    set :port, SidekiqAlive.config.port
-
-    get '/' do
-      if SidekiqAlive.alive?
-        status 200
-        body 'Alive!'
-      else
-        response = "Can't find the alive key"
-        SidekiqAlive.logger.error(response)
-        status 404
-        body response
+  class Server
+    class << self
+      def run!
+        handler =  Rack::Handler.get(server)
+
+        Signal.trap('TERM') { handler.shutdown }
+
+        handler.run(self, Port: port, Host: host)
+      end
+
+      def host
+        SidekiqAlive.config.host
+      end
+
+      def port
+        SidekiqAlive.config.port
+      end
+
+      def path
+        SidekiqAlive.config.path
+      end
+
+      def server
+        SidekiqAlive.config.server
+      end
+
+      def call(env)
+        if Rack::Request.new(env).path != path
+          [404, {}, ['Not found']]
+        elsif SidekiqAlive.alive?
+          [200, {}, ['Alive!']]
+        else
+          response = "Can't find the alive key"
+          SidekiqAlive.logger.error(response)
+          [404, {}, [response]]
+        end
       end
     end
   end

data/lib/sidekiq_alive/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SidekiqAlive
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.5'
 end

data/lib/sidekiq_alive/worker.rb

@@ -3,7 +3,7 @@ module SidekiqAlive
     include Sidekiq::Worker
     sidekiq_options retry: false
 
-    def perform(hostname = SidekiqAlive.hostname)
+    def perform(_hostname = SidekiqAlive.hostname)
       write_living_probe
       # schedule next living probe
       self.class.perform_in(config.time_to_live / 2, current_hostname)
@@ -21,7 +21,11 @@ module SidekiqAlive
       # Increment ttl for current registered instance
       SidekiqAlive.register_current_instance
       # after callbacks
-      config.callback.call() rescue nil
+      begin
+        config.callback.call
+      rescue StandardError
+        nil
+      end
     end
 
     def current_hostname

data/sidekiq_alive.gemspec

@@ -1,16 +1,15 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "sidekiq_alive/version"
+require 'sidekiq_alive/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sidekiq_alive"
+  spec.name          = 'sidekiq_alive'
   spec.version       = SidekiqAlive::VERSION
-  spec.authors       = ["Artur Pañach"]
-  spec.email         = ["arturictus@gmail.com"]
+  spec.authors       = ['Artur Pañach']
+  spec.email         = ['arturictus@gmail.com']
 
-  spec.summary       = %q{Liveness probe for sidekiq on Kubernetes deployments.}
-  spec.description   = %q{SidekiqAlive offers a solution to add liveness probe of a Sidekiq instance.
+  spec.summary       = 'Liveness probe for sidekiq on Kubernetes deployments.'
+  spec.description   = 'SidekiqAlive offers a solution to add liveness probe of a Sidekiq instance.
 
   How?
 
@@ -19,23 +18,22 @@ Gem::Specification.new do |spec|
   A Sidekiq job is the responsable to storing this key. If Sidekiq stops processing jobs
   this key gets expired by Redis an consequently the http server will return a 500 error.
 
-  This Job is responsible to requeue itself for the next liveness probe.}
-  spec.homepage      = "https://github.com/arturictus/sidekiq_alive"
-  spec.license       = "MIT"
+  This Job is responsible to requeue itself for the next liveness probe.'
+  spec.homepage      = 'https://github.com/arturictus/sidekiq_alive'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec-sidekiq", "~> 3.0"
-  spec.add_development_dependency "mock_redis"
-  spec.add_dependency "sidekiq"
-  spec.add_dependency "sinatra"
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'mock_redis'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-sidekiq', '~> 3.0'
+  spec.add_dependency 'sidekiq'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.5
 platform: ruby
 authors:
 - Artur Pañach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -67,49 +53,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-sidekiq
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: mock_redis
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: rspec-sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Liveness probe for sidekiq on Kubernetes deployments.