sidekiq_alive 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364bf320e50acf4acacc6b092ddc878e094762a048f03b8496b03dca50c79c67
-  data.tar.gz: a19db126856fbb3629994f2d0aec3fd839462c204a62abe03e0833f140fb16f5
+  metadata.gz: 42f950238fc2224907b8c32fe4219f1ad5d3f3a083e68e0230ce98ede04753a9
+  data.tar.gz: e8d383349ac91b93c86a0f459d59fe963b9e318157c2fe3c7648f5e88cc1c394
 SHA512:
-  metadata.gz: c23f150276af1a182dc6dd7eef752125f12c65de9479ca9877294e0344dd02c9b49cd4174ebbb593996ab8937d538ef5a9b446eed19d5667b6462335d97e5e3a
-  data.tar.gz: 251ddc155702aa38adcd7368f5dd7e55c9fc40558a2e90fcd05d8641e78faa40337060deef492c23e602884250c6e66dfed1a77c46e058149658975e1e858543
+  metadata.gz: 71ce02b4cbdc408a6ab9db14200d78bf2750f130a2d5c1bf877c80854f4b03cfd87e7eda9c3874f6f1ae13950f2d7df61c49a587f7a20c6ca8f1e28bd581ac30
+  data.tar.gz: 981d3bccb5c3fc813614c85b4656708af80c7bb392b7454379d740444a2cb8c0ac0c00bf2d5d2e12a8bd67e68d19236d2eaa39970b79719598f32b79d01ffc76

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.
@@ -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.

data/lib/sidekiq_alive/server.rb

@@ -2,7 +2,7 @@ require 'sinatra/base'
 module SidekiqAlive
   class Server < Sinatra::Base
     set :bind, '0.0.0.0'
-    set :port, SidekiqAlive.config.port
+    set :port, -> { SidekiqAlive.config.port }
 
     get '/' do
       if SidekiqAlive.alive?

data/lib/sidekiq_alive/version.rb

@@ -1,3 +1,3 @@
 module SidekiqAlive
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 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.1
 platform: ruby
 authors:
 - Artur Pañach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler