sidekiq-process_manager 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d03e818fac3487ed18d2763f536b2e97fa526b8d7dd066b1a066407727ff0dba
-  data.tar.gz: 1e3e1837c3367a22ced37e111ad6e7d1e9988bcdd7baaf1d07b0b3083857650e
+  metadata.gz: 51d57e09aba69d64225948647f2f95625c668b44eb16e514b5ab4daf8e064e3c
+  data.tar.gz: 73d49c20ce5bf06a8d84a168d8e1afa2b04883ea1656d3d4e0ac96b66855140c
 SHA512:
-  metadata.gz: feae2e03df3bc77c6590a1da6bcb5079761184a6e5d37f05c81451b7f52783c8b496dbbdfa71b793a8adfe7eaf8bde293e185ec1ecc1b0a90a802cab772a30dc
-  data.tar.gz: 988f0f484e747142c8b725e80717bc0edefee68d9600595352f27a2c343535bc2c6e56ecde5c10dccf56c775b1210f9e50f3a542ed2095fd2e0041fedbfcff93
+  metadata.gz: 2f35e8a6ccbbcbaa15fbbbd62658bd79e4337e675a0c4a776e8dc2c6457bb957ed5ba9880336532a68f54e5ea13890917d758d5f84a2395130c0c52a5166a7cc
+  data.tar.gz: dd4fa55ec09584a890e5125d93a64d15924b138583d23e91331a1818bec0c58dfa0cdd81ab58bfab37951a645ed41e149fa04996ec89d11c85c0362204c21be4

data/CHANGELOG.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.1.0] - Unreleased
+## 1.1.1
+
+### Added
+- Guards to ensure signal processing thread doesn't die.
+
+## 1.1.0
 
 ### Added
 - Sidekiq 7 support.
@@ -15,17 +20,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Sidekiq < 5.0 support.
 - Ruby < 2.5 support.
 
-## [1.0.4] - 2021-05-20
+## 1.0.4
 
 ### Fixed
 - Set $0 to "sidekiq" in preforked process so instrumentation libraries detecting sidekiq server from the command line will work.
 
-## [1.0.3] - 2021-05-19
+## 1.0.3
 
 ### Fixed
 - Restore bin dir to gem distribution.
 
-## [1.0.2] - 2021-05-19
+## 1.0.2
 
 ### Added
 - Support for sidekiq >= 6.1.
@@ -34,12 +39,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Minimum Ruby version 2.3.
 
-## [1.0.1] - 2020-02-20
+## 1.0.1
 
 ### Changed
 - Remove auto require of `sidekiq/cli` so `require: false` does not need to be specified in a Gemfile.
 
-## [1.0.0] - 2019-11-27
+## 1.0.0
 
 ### Added
 - Initial release.

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/sidekiq/process_manager/manager.rb

@@ -64,6 +64,19 @@ module Sidekiq
 
         @signal_pipe_read, @signal_pipe_write = IO.pipe
 
+        @signal_thread = Thread.new do
+          Thread.current.name = "signal-handler"
+
+          while @signal_pipe_read.wait_readable
+            begin
+              signal = @signal_pipe_read.gets.strip
+              send_signal_to_children(signal.to_sym)
+            rescue => e
+              log_error("Error handling signal #{signal}: #{e.message}")
+            end
+          end
+        end
+
         # Trap signals that will be forwarded to child processes
         [:INT, :TERM, :USR1, :USR2, :TSTP, :TTIN].each do |signal|
           ::Signal.trap(signal) do
@@ -73,15 +86,6 @@ module Sidekiq
           end
         end
 
-        @signal_thread = Thread.new do
-          Thread.current.name = "signal-handler"
-
-          while @signal_pipe_read.wait_readable
-            signal = @signal_pipe_read.gets.strip
-            send_signal_to_children(signal.to_sym)
-          end
-        end
-
         # Ensure that child processes receive the term signal when the master process exits.
         at_exit do
           if ::Process.pid == master_pid && @process_count > 0
@@ -143,15 +147,6 @@ module Sidekiq
         @started
       end
 
-      # Kill a child process by sending the TERM signal to it.
-      #
-      # @param pid [Integer] The pid of the child process to kill.
-      # @return [void]
-      # @api private
-      def kill(pid)
-        ::Process.kill(:TERM, pid)
-      end
-
       private
 
       def log_info(message)
@@ -265,7 +260,11 @@ module Sidekiq
                 memory = GetProcessMem.new(pid)
                 if memory.bytes > @max_memory
                   log_warning("Kill bloated sidekiq process #{pid}: #{memory.mb.round}mb used")
-                  kill(pid)
+                  begin
+                    ::Process.kill(:TERM, pid)
+                  rescue Errno::ESRCH
+                    # The process is already dead
+                  end
                   break
                 end
               rescue => e
@@ -292,7 +291,11 @@ module Sidekiq
         end
 
         pids.each do |pid|
-          ::Process.kill(:INT, pid) if process_alive?(pid)
+          begin
+            ::Process.kill(:INT, pid) if process_alive?(pid)
+          rescue
+            # Ignore errors so we can continue to kill other processes.
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-process_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Durand