worker_killer 1.1.0.214146 → 1.1.0.214159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabc2f6b314a0e9a0e81a078ac3954c5355e24017373fad26f4de4fbeea2f00f
-  data.tar.gz: deb1ebcf899be03574b4611aee0b3f8e08f4c6f57e5babddeaa2bc5d20f70ed7
+  metadata.gz: a765c4a2926183623220942f0919ad8f7d83302b7e03140fa8e2509e5639788f
+  data.tar.gz: e06fc24c3067f25d03ee1f43ead253330c0a7734e139d8f3678ec42cc2d59e0d
 SHA512:
-  metadata.gz: 80da7063d7ab1d3ce70baf42414e7dc6aea1310d85285cc10c95c9a09d980b0b8db98438985ffe422e82b20c4aab73ea05c717924dac47442c4aed1f257a1fae
-  data.tar.gz: 0e40fd946bb0a0f5e4cdb36e469738c195c555e4495e379f943a90fb336166f4f56e09a7a60ffafea782a597979db79d21123ded769c4412843d8f05397aa12d
+  metadata.gz: 8a7a69c2c344967413ce45923a07e97bd265ccb6c84a14e6eb18377f3a1c8c791d32360fbc81aa1d0ff8c3e1af0da2d5120d7e003fa9a601383c7a954052de1d
+  data.tar.gz: 1da895a3b057fc9b896fa2a0a5d3cf670f1eaafa2b190ccaf5ee3c31080a48ecae93d795d2d46d130700fd106cf3a1a54cef6e2f0adc2b8d462938253fb623b5

data/lib/worker_killer/killer/puma.rb

@@ -13,14 +13,12 @@ module ::WorkerKiller
       end
 
       def do_kill(sig, pid, alive_sec, **_params)
-        if sig == :KILL
-          logger.error "#{self} force to kill self[#{worker_num}] (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
-          Process.kill sig, pid
-          return
-        end
+        return if @already_sended == sig
 
         logger.warn "#{self} send #{worker_num} to Puma Plugin (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
 
+        @already_sended = sig
+
         Socket.unix(ipc_path) do |sock|
           sock.puts Integer(worker_num).to_s
         end

data/spec/killer/puma_spec.rb

@@ -20,8 +20,8 @@ RSpec.describe WorkerKiller::Killer::Puma do
     end
 
     it 'expect right signal order' do
-      expect(Socket).to receive(:unix).with(ipc_path).and_yield(buffer).exactly(4).times
-      expect(Process).to receive(:kill).with(:KILL, anything).exactly(5).times
+      expect(Socket).to receive(:unix).with(ipc_path).and_yield(buffer).exactly(3).times
+      expect(Process).not_to receive(:kill)
 
       killer.kill(Time.now)
       expect(buffer.string.strip).to eq(99.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.1.0.214146
+  version: 1.1.0.214159
 platform: ruby
 authors:
 - Samoilenko Yuri
@@ -176,17 +176,17 @@ signing_key:
 specification_version: 4
 summary: Kill any workers by memory and request counts or take custom reaction
 test_files:
-- spec/middleware_spec.rb
+- spec/killer/signal_spec.rb
+- spec/killer/puma_spec.rb
+- spec/killer/delayed_job_spec.rb
+- spec/killer/passenger_spec.rb
+- spec/puma_plugin_spec.rb
 - spec/killer_spec.rb
+- spec/count_limiter_spec.rb
+- spec/worker_killer_spec.rb
+- spec/support/logger.rb
+- spec/middleware_spec.rb
 - spec/spec_helper.rb
-- spec/puma_plugin_spec.rb
 - spec/delayed_job_plugin/oom_limiter_spec.rb
 - spec/delayed_job_plugin/jobs_limiter_spec.rb
-- spec/killer/passenger_spec.rb
-- spec/killer/puma_spec.rb
-- spec/killer/signal_spec.rb
-- spec/killer/delayed_job_spec.rb
 - spec/memory_limiter_spec.rb
-- spec/support/logger.rb
-- spec/worker_killer_spec.rb
-- spec/count_limiter_spec.rb