zombie_passenger_killer 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zombie_passenger_killer (0.2.0)
+    zombie_passenger_killer (0.2.1)
 
 GEM
   remote: http://rubygems.org/

data/Readme.md

@@ -27,8 +27,9 @@ Usage
         -g, --grace [SECONDS]            Wait SECONDS before hard-killing (-9) a process (default: 5)
         -i, --interval [SECONDS]         Check every SECONDS (default: 10)
         -p, --pattern [PATTERN]          Find processes with this pattern (default: ' Rack: ')
-        -h, --help                       Show this.
+        -h, --help                       Show this
         -v, --version                    Show Version
+        -t, --time                       Show time in output
 
 
 ### Bluepill script
@@ -40,6 +41,13 @@ Usage
       process.daemonize = true
     end
 
+### Monit script
+
+    check process zombie_killer
+      with pidfile "/var/run/zombie_passenger_killer.pid"
+      start program = "/bin/bash -c 'export PATH=$PATH:/usr/local/bin HOME=/home;zombie_passenger_killer --max 5 --history 10 --cpu 30 --interval 10 &>/var/log/zombie_passenger_killer.log & &>/dev/null;echo $! > /var/run/zombie_passenger_killer.pid'"
+      stop program = "/bin/bash -c 'PIDF=/var/run/zombie_passenger_killer.pid;/bin/kill `cat $PIDF` && rm -f $PIDF'"
+      group zombie_killer
 
 ### God script
 

data/bin/zombie_passenger_killer

@@ -5,6 +5,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'zombie_passenger_killer'
 
 options = {}
+version = ZombiePassengerKiller::VERSION
 OptionParser.new do |opts|
   opts.banner = <<BANNER
 Guaranteed zombie passengers death
@@ -20,17 +21,13 @@ BANNER
   opts.on("-g", "--grace [SECONDS]", Integer, "Wait SECONDS before hard-killing (-9) a process (default: 5)") {|i| options[:grace]=i }
   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("-h", "--help","Show this.") { puts opts; exit }
-  opts.on('-v', '--version','Show Version'){ puts ZombiePassengerKiller::VERSION; exit}
+  opts.on("-h", "--help","Show this") { puts opts; exit }
+  opts.on("-v", "--version","Show Version"){ puts version; exit }
+  opts.on("-t", "--timing","Show timing on output") { options[:show_times]=true }
 end.parse!
 
 $stdout.sync = true
-puts "Started at #{Time.now}"
+puts "PID: #{$$} Version: #{version} Started at #{Time.now}"
 
-killer = ZombiePassengerKiller::Reaper.new(options)
-
-$0 = File.basename(__FILE__)
-loop do
-  killer.hunt_zombies
-  sleep options[:interval] || 10
-end
+$0 = File.basename(__FILE__) + '-' + version
+ZombiePassengerKiller::Reaper.new(options).lurk

data/lib/zombie_passenger_killer/reaper.rb

@@ -10,10 +10,22 @@ module ZombiePassengerKiller
       @high_cpu = options[:cpu] || 70
       @grace_time = options[:grace] || 5
       @pattern = options[:pattern] || ' Rack: '
+      @show_times = options[:show_times] || false
+      @interval = options[:interval] || 10
       @strace_time = 5
       @out = STDOUT
     end
 
+    def lurk
+      loop do
+        hunt_zombies
+        sleep @interval
+      end
+    rescue Interrupt
+      log "Exiting..."
+      raise $!
+    end
+
     def store_current_cpu(processes)
       keys_to_remove = @history.keys - processes.map{|x| x[:pid] }
       keys_to_remove.each{|k| !@history.delete k }
@@ -64,12 +76,15 @@ module ZombiePassengerKiller
     end
 
     def kill_zombie(pid)
-      @out.puts "Killing passenger process #{pid}"
-      @out.puts get_strace(pid, @strace_time)
+      log "Killing passenger process #{pid}"
+      log get_strace(pid, @strace_time)
       Process.kill('TERM', pid) rescue nil
       sleep @grace_time # wait for it to die
       Process.kill('KILL', pid) rescue nil
     end
 
+    def log(msg)
+      @out.puts "#{@show_times ? "** [#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] #$$: " : ''}#{msg}"
+    end
   end
 end

data/lib/zombie_passenger_killer/version.rb

@@ -1,3 +1,3 @@
 module ZombiePassengerKiller
-  Version = VERSION = '0.2.0'
+  Version = VERSION = '0.2.1'
 end

data/spec/zombie_passenger_killer_spec.rb

@@ -2,11 +2,17 @@ require File.expand_path('spec/spec_helper')
 
 describe ZombiePassengerKiller do
   let(:killer){
-    k = ZombiePassengerKiller::Reaper.new(@options || {})
-    k.stub!(:passenger_pids).and_return([111])
-    k
+    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
@@ -60,7 +66,6 @@ describe ZombiePassengerKiller do
 
   describe "#kill_zombies" do
     before do
-      killer.out = StringIO.new
       killer.instance_eval{
         @grace_time = 0.1
         @strace_time = 0.1
@@ -87,11 +92,6 @@ describe ZombiePassengerKiller do
       false
     end
 
-    def output
-      killer.out.rewind
-      killer.out.read
-    end
-
     it "kills normal processes" do
       pid = start_bogus_process
       lambda{
@@ -125,6 +125,47 @@ describe ZombiePassengerKiller do
     end
   end
 
+  describe "#log" do
+    it "logs simple when :show_times is not given" do
+      killer.log "X"
+      output.should == "X\n"
+    end
+
+    it "logs simple when :show_times is not given" do
+      @options = {:show_times => true}
+      killer.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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zombie_passenger_killer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-02-11 00:00:00 Z
 dependencies: []
 
 description: