sidekiq-err 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 540a25393182c06c16aa1133a3eb97a382a4e7918d37564ab48ea1f5244b3bad
-  data.tar.gz: 1780bcba830dc7332e999381ade9e86f0480d4386727aef14f7f680ea1e0efd6
+  metadata.gz: ead219be46df36a1507a4c648fe192447617080adb2457b9e1db85a4943012a5
+  data.tar.gz: eca16de0c52782b7ad768712d1a2e31482fa37e1e2cf3904f720b74be3da5b38
 SHA512:
-  metadata.gz: 0d40784c25269602e7b9698583f27a0cc0a6c760693bc0947a5a816789b4a29ee79dc16fe6d5e8598a5efd090e84aba1123c3ea5080681664a9e76e7469d5418
-  data.tar.gz: 12b25794cdb14be82e0a048037596d897764f3b56bb2b875904cd8909c1266f67f9475725fbecae9bf2ca7bf0aa4d584fcc9caa06c6c30b78cddba74f033cd6a
+  metadata.gz: 8085e4bc38a2db6f3bb4c0f661e11ba747b920054d3b9e2a4278d510fc89bb599e1f366cf391a87643cda5215141f9f132ce75aa1dfc5ef638e2c1eab4686854
+  data.tar.gz: ed89f1e4284f1c8b2a8898549875b9a58cfb300081a473c8a2d111d72cac522176ea8bb3cfb9a241dd6815f5fcc6e3a4cef0a7b6fdd32840b228edcc4ef84766

data/exe/sidekiq-err

@@ -10,7 +10,13 @@ require 'pry' if ENV.fetch('USE_PRY', false)
 begin
   case ARGV[0]
   when '-a', '--alive'
-    SidekiqErr.alive?
+    if ARGV[1]
+      SidekiqErr.alive?(ARGV[1])
+    else
+      puts
+      puts 'Missing hostname argument, use --help for usage details'
+      puts
+    end
   when '-r', '--report'
     SidekiqErr.status(ARGV[1])
   when '-h', '--help'

data/lib/sidekiq-err/alive.rb

@@ -2,9 +2,21 @@
 
 module SidekiqErr
   class Alive
-    def self.check?
+    def self.check?(hostname)
       process_set = Sidekiq::ProcessSet.new
-      raise(NoProcessFound, 'No sidekiq process running!') if process_set.size.zero?
+      # now search for the provided process name in the process set
+      found_process = process_set.find do |process|
+        # we compare the process hostname here as we can know this from k8s land pod
+        # and can use the $HOSTNAME env var in the probe command in the probe specification
+        #
+        # https://stackoverflow.com/questions/58800495/get-a-kubernetes-pods-full-id-from-inside-of-itself-running-container
+        # Note: this aligns to 1 sidekiq container process per pod
+        #         this may not hold true in some deployments but should work for most use cases
+        #         it's preferable to use pod auto scaling vs running multiple containers in a pod
+        process['hostname'] == hostname
+      end
+
+      raise(NoProcessFound, "No sidekiq process found for hostname: #{hostname}") unless found_process
     end
   end
 end

data/lib/sidekiq-err/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqErr
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/sidekiq-err.rb

@@ -15,9 +15,9 @@ module SidekiqErr
     puts
     puts "Usage: #{CMD}"
     puts
-    puts '       -a, --alive'
-    puts '         check if at least 1 Sidekiq process is running'
-    puts '         sets the exit code to 1 if no process if found'
+    puts '       -a, --alive HOSTNAME'
+    puts '         check if the HOSTNAME is present in the Sidekiq process list'
+    puts '         sets the exit code to 1 if the HOSTNAME process is not found'
     puts
     puts '       -r, --report [SECTION_NAME]'
     puts '         view the status report'
@@ -32,7 +32,7 @@ module SidekiqErr
     SidekiqErr::View.new(section).display
   end
 
-  def self.alive?
-    SidekiqErr::Alive.check?
+  def self.alive?(hostname)
+    SidekiqErr::Alive.check?(hostname)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-err
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Campbell Allen