worker_killer 0.1.0.19844 → 0.1.0.30337

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f35f1ea9a4591062e331c861888dbe5119191e94510e42d3900ab0826ccfad9f
-  data.tar.gz: 170b036d6c77ffbc483318f683479266d05df0a97af83ed417f27b8b2fdc380e
+  metadata.gz: f82e8e7af98e4d6412f25fba67ce6557012f4837173ac2447d1c87fdabe8fef1
+  data.tar.gz: 4a7d13da9e325d0514fbc4fe75dc15890ea82cef14ff847c8c60dbb859c63b91
 SHA512:
-  metadata.gz: 036ca0c4a7f7107c6c793b094f6f93282a54a3c053b7080f14fdea1ef3211aa806d2e336483e09ea59153ddb209229d64dd0af577d34268f599dac76e43e8f6a
-  data.tar.gz: 41c34fa4b40ce654871bb1f1b6e6a0591894d7aa10e546848dc2778b2ddcc8f34eef3dbd6b3a14b15f80b76a4c4d0970a3c3479eb5a3b779a0e0c6bd0e3e57f9
+  metadata.gz: 4b4a853921c5fc93a16a686c8572e427cf6faa2436b670af01d01ee18e707c3974a43625ac8e393accf0be63195f8101054d6f012f25b0bde9dc8c0c974b37fc
+  data.tar.gz: 2c0febe3c7176a32d6b83d3654c5a098531ebc74a4bb725ce0beebfc2fb3c78bb9def46c2515ca20510b8656448c965b6ce81beb1d377c2ddf6f138cd88484ea

data/lib/worker_killer.rb

@@ -29,7 +29,6 @@ module WorkerKiller
   # signal. A single signal is sent per request.
   def self.kill_self(logger, start_time)
     alive_sec = (Time.now - start_time).round
-    self_pid = Process.pid
 
     @kill_attempts ||= 0
     @kill_attempts += 1
@@ -43,8 +42,26 @@ module WorkerKiller
       sig = :KILL if @kill_attempts > configuration.kill_attempts
     end
 
-    logger.warn "#{self} send SIG#{sig} (pid: #{self_pid}) alive: #{alive_sec} sec (trial #{@kill_attempts})"
-    Process.kill sig, self_pid
+    if sig == :QUIT && configuration.passenger?
+      kill_by_passenger(logger, alive_sec, configuration.passenger_config, Process.pid)
+    else
+      kill_by_signal(logger, alive_sec, sig, Process.pid)
+    end
+  end
+
+  def self.kill_by_signal(logger, alive_sec, signal, pid)
+    logger.warn "#{self} send SIG#{signal} (pid: #{pid}) alive: #{alive_sec} sec (trial #{@kill_attempts})"
+    Process.kill signal, pid
+  end
+
+  def self.kill_by_passenger(logger, alive_sec, passenger, pid)
+    cmd = "#{passenger} detach-process #{pid}"
+    logger.warn "#{self} run #{cmd.inspect} (pid: #{pid}) alive: #{alive_sec} sec (trial #{@kill_attempts})"
+    Thread.new(cmd) do |command|
+      unless Kernel.system(command)
+        logger.warn "#{self} run #{cmd.inspect} failed: #{$?.inspect}"
+      end
+    end
   end
 
 end

data/lib/worker_killer/configuration.rb

@@ -4,16 +4,47 @@ module WorkerKiller
   # Methods for configuring WorkerKiller
   class Configuration
 
-    attr_accessor :logger, :quit_attempts, :kill_attempts, :use_quit
+    attr_accessor :logger, :quit_attempts, :kill_attempts, :use_quit, :passenger_config
 
     # Override defaults for configuration
-    def initialize(quit_attempts: 5, kill_attempts: 10, use_quit: true)
+    def initialize(quit_attempts: 5, kill_attempts: 10, use_quit: true, passenger_config: nil)
       @quit_attempts = quit_attempts
       @kill_attempts = kill_attempts
       @use_quit = use_quit
+      @passenger_config = check_passenger(passenger_config)
       @logger = Logger.new(STDOUT, level: Logger::INFO, progname: 'WorkerKiller')
     end
 
+    def passenger?
+      !@passenger_config.nil?
+    end
+
+    def check_passenger provided_path
+      if provided_path.nil? || provided_path.empty?
+        return check_passenger_config(`which passenger-config`)
+      else
+        return check_passenger_config!(provided_path)
+      end
+    end
+
+    def check_passenger_config path
+      path.strip!
+      help = `#{path} detach-process --help 2> /dev/null`
+      if help['Remove an application process from the Phusion Passenger process pool']
+        return path
+      end
+    rescue StandardError => e
+      return nil
+    end
+
+    def check_passenger_config! path
+      if path = check_passenger_config(path)
+        return path
+      else
+        raise "Can't find passenger config at #{path.inspect}"
+      end
+    end
+
   end
 end
 

data/lib/worker_killer/middleware.rb

@@ -9,6 +9,8 @@ module WorkerKiller
     def initialize(app, klass:, reaction: nil, **opts)
       @app = app
 
+      @passenger = system('which passenger')
+
       reaction ||= proc do |limiter|
         WorkerKiller.kill_self(limiter.logger, limiter.started_at)
       end

data/spec/worker_killer_spec.rb

@@ -23,6 +23,27 @@ RSpec.describe WorkerKiller do
     end
   end
 
+  describe '#kill_by_signal' do
+    [:QUIT, :TERM, :KILL].each do |sig|
+      it "must send #{sig} signal" do
+        pid = rand(1000)
+        expect(Process).to receive(:kill).with(sig, pid)
+        WorkerKiller.kill_by_signal(logger, 11111, sig, pid)
+      end
+    end
+  end
+
+  describe '#kill_by_passenger' do
+    it "must run passenger-config" do
+      pid = rand(1000)
+      path = "passenger-config-#{rand(1000)}"
+      expect(Kernel).to receive(:system).with("#{path} detach-process #{pid}").and_return(true)
+
+      thread = WorkerKiller.kill_by_passenger(logger, 11111, path, pid)
+      thread.join
+    end
+  end
+
   describe '#kill_self' do
     context 'with use_quit TRUE' do
       around do |example|
@@ -35,9 +56,10 @@ RSpec.describe WorkerKiller do
       end
 
       it 'expect right signal order' do
-        expect(Process).to receive(:kill).with(:QUIT, anything).exactly(2).times
-        expect(Process).to receive(:kill).with(:TERM, anything).exactly(2).times
-        expect(Process).to receive(:kill).with(:KILL, anything).exactly(5).times
+        expect(WorkerKiller).to receive(:kill_by_signal).with(logger, anything, :QUIT, anything).exactly(2).times
+        expect(WorkerKiller).to receive(:kill_by_signal).with(logger, anything, :TERM, anything).exactly(2).times
+        expect(WorkerKiller).to receive(:kill_by_signal).with(logger, anything, :KILL, anything).exactly(5).times
+
         2.times { WorkerKiller.kill_self(logger, Time.now) } # 2 QUIT
         2.times { WorkerKiller.kill_self(logger, Time.now) } # 2 TERM
         5.times { WorkerKiller.kill_self(logger, Time.now) } # other - KILL
@@ -55,8 +77,9 @@ RSpec.describe WorkerKiller do
       end
 
       it 'expect right signal order' do
-        expect(Process).to receive(:kill).with(:TERM, anything).exactly(2).times
-        expect(Process).to receive(:kill).with(:KILL, anything).exactly(5).times
+        expect(WorkerKiller).to receive(:kill_by_signal).with(logger, anything, :TERM, anything).exactly(2).times
+        expect(WorkerKiller).to receive(:kill_by_signal).with(logger, anything, :KILL, anything).exactly(5).times
+
         2.times { WorkerKiller.kill_self(logger, Time.now) } # 2 TERM
         5.times { WorkerKiller.kill_self(logger, Time.now) } # other - KILL
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 0.1.0.19844
+  version: 0.1.0.30337
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem