zombie_passenger_killer 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5780e6196f2270301870a5859bf75a2ab43da51a
+  data.tar.gz: 032a0875bb8d4bffd797b1aadb9bb2b21ce17c1e
+SHA512:
+  metadata.gz: 90d28d0ff5cca9d60b208a757f99bed45739a197ea920cd9032680a1b284b3fab8654c657508851fac4a8361d0dcf61e82666211b86a4f13ec4a095099e9cabb
+  data.tar.gz: c0f70fa2e121e6e7044b8dc99fcd81f1e47c2bcc433190b65566c31e9e9e7672e0da7abe78eadfecf98df30b82c777acccd8f77a09f799d58d6bf50ed75185bb

data/Readme.md

@@ -13,7 +13,10 @@ Add passenger-status to `/etc/sudoers` or run with sudo.
 
 Install
 =======
-    sudo gem install zombie_passenger_killer
+
+```
+sudo gem install zombie_passenger_killer
+```
 
 Usage
 =====
@@ -36,12 +39,14 @@ Usage
 
 ### Bluepill script
 
-    app.process("zombie_passenger_killer") do |process|
-      process.start_command = "zombie_passenger_killer --max 5 --history 10 --cpu 30 --interval 10"
-      process.stdout = process.stderr = "/var/log/autorotate/zombie_passenger_killer.log"
-      process.pid_file = "/var/run/zombie_passenger_killer.pid"
-      process.daemonize = true
-    end
+```Ruby
+app.process("zombie_passenger_killer") do |process|
+  process.start_command = "zombie_passenger_killer --max 5 --history 10 --cpu 30 --interval 10"
+  process.stdout = process.stderr = "/var/log/autorotate/zombie_passenger_killer.log"
+  process.pid_file = "/var/run/zombie_passenger_killer.pid"
+  process.daemonize = true
+end
+```
 
 ### Monit script
 
@@ -62,9 +67,10 @@ Author
  - [Roman Heinrich](https://github.com/mindreframer)
  - [Kevin Mullin](https://github.com/kmullin)
  - [Valery Vishnyakov](https://github.com/balepc)
+ - [Bodo Tasche](https://github.com/bitboxer)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://secure.travis-ci.org/grosser/zombie_passenger_killer.png)](http://travis-ci.org/grosser/zombie_passenger_killer)
+[![Build Status](https://travis-ci.org/grosser/zombie_passenger_killer.png)](https://travis-ci.org/grosser/zombie_passenger_killer)
 

data/bin/zombie_passenger_killer

@@ -22,6 +22,7 @@ BANNER
   opts.on("-i", "--interval [SECONDS]", Integer, "Check every SECONDS (default: 10)") {|i| options[:interval]=i }
   opts.on("-p", "--pattern [PATTERN]", String, "Find processes with this pattern (default: ' Rack: ')") {|i| options[:pattern]=i }
   opts.on("-1", "--once", "Check once and exit") { options[:once]=true }
+  opts.on("--verbose", "Verbose") { options[:verbose] = true }
   opts.on("--rvmsudo", "Use `rvmsudo` to see passenger-status") { options[:rvmsudo]=true }
   opts.on("-h", "--help","Show this") { puts opts; exit }
   opts.on("-v", "--version","Show Version"){ puts version; exit }

data/lib/zombie_passenger_killer/reaper.rb

@@ -12,6 +12,7 @@ module ZombiePassengerKiller
       @pattern = options[:pattern] || ' Rack: '
       @show_times = options[:show_times] || false
       @interval = options[:interval] || 10
+      @verbose = options[:verbose]
       @strace_time = 5
       @out = STDOUT
       @rvmsudo = options[:rvmsudo]
@@ -29,8 +30,13 @@ module ZombiePassengerKiller
 
     def hunt_zombies
       active_pids_in_passenger_status = passenger_pids
+      puts "Active pids in status: #{active_pids_in_passenger_status.inspect}" if @verbose
+
       active_processes_in_processlist = process_status
+      puts "Active pids in processlist: #{active_processes_in_processlist.inspect}" if @verbose
+
       zombies = active_processes_in_processlist.map{|x| x[:pid] } - active_pids_in_passenger_status rescue Array.new
+      puts "Zombies: #{zombies.inspect}" if @verbose
 
       # kill processes with high CPU if user wants it
       high_load = if @max_high_cpu
@@ -65,10 +71,10 @@ module ZombiePassengerKiller
       `( strace -p #{pid} 2>&1 ) & sleep #{time} ; kill $! 2>&1`
     end
 
-    # return array of pids reported from passenger-status command, nil if passenger-status doesn't run
+    # return array of pids reported from passenger-status command, nil if passenger doesn't run
     def passenger_pids
-      pids = %x(#{'rvmsudo ' if @rvmsudo}passenger-status|grep PID).split("\n").map { |x| x.strip.match(/PID: \d*/).to_s.split[1].to_i }
-      if $?.exitstatus.zero?
+      pids = %x(#{'rvmsudo ' if @rvmsudo}passenger-status).split("\n").map { |l| l[/PID: (\d+)/, 1] }.compact.map(&:to_i)
+      if $?.success?
         pids
       else
         raise "passenger-status returned a #{$?.exitstatus} exit code. Please check if passenger-status is working properly."
@@ -76,9 +82,9 @@ module ZombiePassengerKiller
     end
 
     def process_status
-      %x(ps -eo pid,pcpu,args|grep -v grep|egrep '#{@pattern}').split("\n").map do |line|
-         values = line.strip.split[0..1]
-         {:pid => values.first.to_i, :cpu => values.last.to_f}
+      %x(ps -eo pid,pcpu,args|grep -v grep|grep -v zombie_passenger_killer|egrep '#{@pattern}').split("\n").map do |line|
+        values = line.strip.split[0..1]
+        {:pid => values.first.to_i, :cpu => values.last.to_f}
       end
     end
 

data/lib/zombie_passenger_killer/version.rb

@@ -1,3 +1,3 @@
 module ZombiePassengerKiller
-  Version = VERSION = '0.3.0'
+  Version = VERSION = '0.3.1'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zombie_passenger_killer
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -18,47 +17,33 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Rakefile
 - Readme.md
 - bin/zombie_passenger_killer
 - lib/zombie_passenger_killer.rb
 - lib/zombie_passenger_killer/reaper.rb
 - lib/zombie_passenger_killer/version.rb
-- spec/spec_helper.rb
-- spec/zombie_passenger_killer_spec.rb
-- zombie_passenger_killer.gemspec
-homepage: http://github.com/grosser/zombie_passenger_killer
+homepage: https://github.com/grosser/zombie_passenger_killer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 91186768020065310
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 91186768020065310
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guaranteed zombie passengers death
 test_files: []

data/.travis.yml

@@ -1,4 +0,0 @@
-rvm:
-  - ree
-  - 1.9.2
-  - 1.9.3

data/Gemfile

@@ -1,6 +0,0 @@
-source :rubygems
-gemspec
-
-gem 'rake'
-gem 'rspec', '~>2'
-gem 'bump'

data/Gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: .
-  specs:
-    zombie_passenger_killer (0.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bump (0.3.9)
-    diff-lcs (1.1.3)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  rake
-  rspec (~> 2)
-  zombie_passenger_killer!

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'bump/tasks'
-
-task :default do
-  sh "rspec spec/"
-end

data/spec/spec_helper.rb

@@ -1 +0,0 @@
-require 'zombie_passenger_killer'

data/spec/zombie_passenger_killer_spec.rb

@@ -1,186 +0,0 @@
-require 'spec_helper'
-
-describe ZombiePassengerKiller do
-  let(:killer){
-    ZombiePassengerKiller::Reaper.new(@options || {}).tap do |k|
-      k.stub!(:passenger_pids).and_return([111])
-      k.out = StringIO.new
-    end
-  }
-
-  def output
-    killer.out.rewind
-    killer.out.read
-  end
-
-  it "has a VERSION" do
-    ZombiePassengerKiller::VERSION.should =~ /^\d+\.\d+\.\d+$/
-  end
-
-  describe "#hunt_zombies" do
-    it "does not kill anything by default" do
-      killer.should_not_receive(:kill_zombie)
-      killer.hunt_zombies
-    end
-
-    it "finds the right zombies" do
-      killer.stub!(:passenger_pids).and_return([123])
-      killer.stub!(:process_status).and_return([{:pid => 124, :cpu => 0}])
-      killer.should_receive(:kill_zombie).with(124)
-      killer.hunt_zombies
-    end
-
-    it "does not blow up when there are more processes in pids then status" do
-      @options = {:max => 1}
-      killer.stub!(:passenger_pids).and_return([123])
-      killer.stub!(:process_status).and_return([{:pid => 124, :cpu => 0}])
-      killer.should_receive(:kill_zombie).with(124)
-      killer.hunt_zombies
-    end
-
-    it "kills zombies with high cpu over max" do
-      @options = {:max => 1}
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-      killer.should_receive(:kill_zombie).with(111)
-      killer.hunt_zombies
-    end
-
-    it "does not kills zombies with high cpu under max" do
-      @options = {:max => 2}
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-      killer.should_not_receive(:kill_zombie).with(111)
-      killer.hunt_zombies
-    end
-
-    it "ignores high cpu levels in old history" do
-      @options = {:max => 2, :history => 2}
-      killer.should_not_receive(:kill_zombie).with(111)
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-      killer.hunt_zombies
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 0}])
-      killer.hunt_zombies
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-      killer.hunt_zombies
-    end
-
-    it "kills on high cpu levels in recent history" do
-      @options = {:max => 2, :history => 2}
-      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-      killer.hunt_zombies
-      killer.should_receive(:kill_zombie).with(111)
-      killer.hunt_zombies
-    end
-  end
-
-  describe "#kill_zombies" do
-    before do
-      killer.instance_eval{
-        @grace_time = 0.1
-        @strace_time = 0.1
-      }
-    end
-
-    def pid_of(marker)
-      processes = `ps -ef | grep '#{marker}' | grep -v grep`
-      processes.strip.split("\n").last.split(/\s+/)[1].to_i
-    end
-
-    def start_bogus_process(options={})
-      marker = "TEST---#{rand(999999999999)}"
-      Thread.new do
-        `ruby -e 'at_exit{ puts "proper exit"; #{'sleep 10' if options[:hang]}}; sleep 10; puts "#{marker}"' 2>&1`
-      end
-      sleep 1 # give process time to spin up
-      pid_of(marker)
-    end
-
-    def process_alive?(pid)
-      Process.getpgid(pid)
-    rescue Errno::ESRCH
-      false
-    end
-
-    it "kills normal processes" do
-      pid = start_bogus_process
-      lambda{
-        killer.send(:kill_zombie, pid)
-        sleep 0.1
-      }.should change{ process_alive?(pid) }
-    end
-
-    it "kills hanging processes" do
-      pid = start_bogus_process :hang => true
-      lambda{
-        killer.send(:kill_zombie, pid)
-        sleep 0.1
-      }.should change{ process_alive?(pid) }
-    end
-
-    it "prints an strace of the process" do
-      pid = start_bogus_process
-      killer.send(:kill_zombie, pid)
-      output.should include('attach:')
-    end
-
-    it "does not take a strace of a dead process" do
-      killer.send(:kill_zombie, 111)
-      output.should_not include('attach:')
-    end
-
-    it "does not fail with an unknown pid" do
-      killer.send(:kill_zombie, 111)
-      output.should include('No such process')
-    end
-  end
-
-  describe "#log" do
-    it "logs simple when :show_times is not given" do
-      killer.send(:log, "X")
-      output.should == "X\n"
-    end
-
-    it "logs simple when :show_times is not given" do
-      @options = {:show_times => true}
-      killer.send(:log, "X")
-      output.should include(Time.now.year.to_s)
-    end
-  end
-
-  describe "#lurk" do
-    it "sleeps after checking" do
-      killer.should_receive(:hunt_zombies)
-      killer.should_receive(:sleep).with(10).and_raise "LOOP-BREAKER"
-      lambda{
-        killer.lurk
-      }.should raise_error "LOOP-BREAKER"
-    end
-
-    it "calls sleep with the given interval" do
-      @options = {:interval => 5}
-      killer.stub(:hunt_zombies)
-      killer.should_receive(:sleep).with(5).and_raise "LOOP-BREAKER"
-      lambda{
-        killer.lurk
-      }.should raise_error "LOOP-BREAKER"
-    end
-
-    it "prints Exiting on Interrupt" do
-      killer.stub(:hunt_zombies)
-      killer.should_receive(:sleep).and_raise Interrupt.new
-      lambda{
-        killer.lurk
-      }.should raise_error Interrupt
-      output.should include("Exiting")
-    end
-  end
-
-  describe "cli" do
-    it "prints its version" do
-      `./bin/zombie_passenger_killer -v`.should =~ /^\d+\.\d+\.\d+$/m
-    end
-
-    it "prints help" do
-      `./bin/zombie_passenger_killer -h`.should include('Usage')
-    end
-  end
-end

data/zombie_passenger_killer.gemspec

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'zombie_passenger_killer/version'
-
-Gem::Specification.new "zombie_passenger_killer", ZombiePassengerKiller::VERSION do |s|
-  s.summary = "Guaranteed zombie passengers death"
-  s.authors = ["Michael Grosser"]
-  s.email = "michael@grosser.it"
-  s.homepage = "http://github.com/grosser/zombie_passenger_killer"
-  s.files = `git ls-files`.split("\n")
-  s.executables = ["zombie_passenger_killer"]
-  s.license = "MIT"
-end