zombie_passenger_killer 0.1.3 → 0.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
+gemspec
 
-group :dev do # not development <-> would add unneeded development dependencies in gemspec
+group :development do
   gem 'rake'
   gem 'rspec', '~>2'
-  gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,12 +1,12 @@
+PATH
+  remote: .
+  specs:
+    zombie_passenger_killer (0.2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -21,6 +21,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
   rake
   rspec (~> 2)
+  zombie_passenger_killer!

data/Rakefile

@@ -1,18 +1,21 @@
+require 'bundler/gem_tasks'
+
 task :default do
   sh "rspec spec/"
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'zombie_passenger_killer'
-    gem.summary = "Guaranteed zombie passengers death"
-    gem.email = "michael@grosser.it"
-    gem.homepage = "http://github.com/grosser/#{gem.name}"
-    gem.authors = ["Michael Grosser"]
-  end
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/zombie_passenger_killer/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  version_parts[2] = 0 if index < 2 # remove patch for minor
+  version_parts[1] = 0 if index < 1 # remove minor for major
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
 end

data/Readme.md

@@ -43,14 +43,14 @@ Usage
 
 ### God script
 
-TODO
-
+# TODO
 
 Author
 ======
 
 ###Contributors
- - [mindreframer](https://github.com/mindreframer)
+ - [Roman Heinrich](https://github.com/mindreframer)
+ - [Kevin Mullin](https://github.com/kmullin)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/bin/zombie_passenger_killer

@@ -1,14 +1,9 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'optparse'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'zombie_passenger_killer'
 
-unless system("which timeout > /dev/null")
-  warn "Please install timeout commandline tool e.g. via apt-get install timeout / apt-get install coreutils"
-end
-
 options = {}
 OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -32,8 +27,9 @@ end.parse!
 $stdout.sync = true
 puts "Started at #{Time.now}"
 
-killer = ZombiePassengerKiller.new(options)
+killer = ZombiePassengerKiller::Reaper.new(options)
 
+$0 = File.basename(__FILE__)
 loop do
   killer.hunt_zombies
   sleep options[:interval] || 10

data/lib/zombie_passenger_killer/reaper.rb

@@ -0,0 +1,75 @@
+module ZombiePassengerKiller
+  class Reaper
+
+    attr_accessor :out # overwriteable for tests
+
+    def initialize(options)
+      @history = {}
+      @history_entries = options[:history] || 5
+      @max_high_cpu = options[:max]
+      @high_cpu = options[:cpu] || 70
+      @grace_time = options[:grace] || 5
+      @pattern = options[:pattern] || ' Rack: '
+      @strace_time = 5
+      @out = STDOUT
+    end
+
+    def store_current_cpu(processes)
+      keys_to_remove = @history.keys - processes.map{|x| x[:pid] }
+      keys_to_remove.each{|k| !@history.delete k }
+
+      processes.each do |process|
+        @history[process[:pid]] ||= []
+        @history[process[:pid]] << process[:cpu]
+        @history[process[:pid]] = @history[process[:pid]].last(@history_entries)
+      end
+    end
+
+    def get_strace(pid, time)
+      Process.getpgid(pid) rescue return 'No such process'
+      `( strace -p #{pid} 2>&1 ) & sleep #{time} ; kill $! 2>&1`
+    end
+
+    def hunt_zombies
+      active_pids_in_passenger_status = passenger_pids
+      active_processes_in_processlist = process_status
+      zombies = active_processes_in_processlist.map{|x| x[:pid] } - active_pids_in_passenger_status rescue Array.new
+
+      # kill processes with high CPU if user wants it
+      high_load = if @max_high_cpu
+        store_current_cpu active_processes_in_processlist
+        active_pids_in_passenger_status.select do |pid|
+          @history[pid].count{|x| x > @high_cpu } >= @max_high_cpu
+        end
+      else
+        []
+      end
+
+      (high_load + zombies).each do |pid|
+        kill_zombie pid
+      end
+    end
+
+    # return array of pids reported from passenger-status command, nil if passenger-status doesn't run
+    def passenger_pids
+      pids = %x(passenger-status|grep PID).split("\n").map { |x| x.strip.match(/PID: \d*/).to_s.split[1].to_i }
+      pids if $?.exitstatus.zero?
+    end
+
+    def process_status
+      %x(ps -eo pid,pcpu,args|grep -v grep|grep '#{@pattern}').split("\n").map do |line|
+         values = line.strip.split[0..1]
+         {:pid => values.first.to_i, :cpu => values.last.to_f}
+      end
+    end
+
+    def kill_zombie(pid)
+      @out.puts "Killing passenger process #{pid}"
+      @out.puts 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
+
+  end
+end

data/lib/zombie_passenger_killer/version.rb

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

data/lib/zombie_passenger_killer.rb

@@ -1,71 +1,4 @@
-class ZombiePassengerKiller
-  VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
-  attr_accessor :out # overwriteable for tests
-
-  def initialize(options)
-    @history = {}
-    @history_entries = options[:history] || 5
-    @max_high_cpu = options[:max]
-    @high_cpu = options[:cpu] || 70
-    @grace_time = options[:grace] || 5
-    @pattern = options[:pattern] || ' Rack: '
-    @strace_time = 5
-    @out = STDOUT
-  end
-
-  def store_current_cpu(processes)
-    keys_to_remove = @history.keys - processes.map{|x| x[:pid] }
-    keys_to_remove.each{|k| !@history.delete k }
-
-    processes.each do |process|
-      @history[process[:pid]] ||= []
-      @history[process[:pid]] << process[:cpu]
-      @history[process[:pid]] = @history[process[:pid]].last(@history_entries)
-    end
-  end
-
-  def get_strace(pid, time)
-    Process.getpgid(pid) rescue return 'No such process'
-    `( strace -p #{pid} 2>&1 ) & sleep #{time} ; kill $! 2>&1`
-  end
-
-  def hunt_zombies
-    active_pids_in_passenger_status = passenger_pids
-    active_processes_in_processlist = process_status
-    zombies = active_processes_in_processlist.map{|x| x[:pid] } - active_pids_in_passenger_status
-
-    # kill processes with high CPU if user wants it
-    high_load = if @max_high_cpu
-      store_current_cpu active_processes_in_processlist
-      active_pids_in_passenger_status.select do |pid|
-        @history[pid].count{|x| x > @high_cpu } >= @max_high_cpu
-      end
-    else
-      []
-    end
-
-    (high_load + zombies).each do |pid|
-      kill_zombie pid
-    end
-  end
-
-  def passenger_pids
-    %x(passenger-status|grep PID).split("\n").map{|x| x.strip.match(/PID: \d*/).to_s.split[1]}.map(&:to_i)
-  end
-
-  def process_status
-    %x(ps -eo pid,pcpu,args|grep -v grep|grep '#{@pattern}').split("\n").map do |line|
-       values = line.strip.split[0..1]
-       {:pid => values.first.to_i, :cpu => values.last.to_f}
-    end
-  end
-
-  def kill_zombie(pid)
-    @out.puts "Killing passenger process #{pid}"
-    @out.puts get_strace(pid, @strace_time)
-    Process.kill('TERM', pid) rescue nil
-    sleep @grace_time
-    Process.kill('KILL', pid) rescue nil
-  end
-end
+require 'zombie_passenger_killer/version'
+require 'zombie_passenger_killer/reaper'

data/spec/zombie_passenger_killer_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('spec/spec_helper')
 
 describe ZombiePassengerKiller do
   let(:killer){
-    k = ZombiePassengerKiller.new(@options || {})
+    k = ZombiePassengerKiller::Reaper.new(@options || {})
     k.stub!(:passenger_pids).and_return([111])
     k
   }

data/zombie_passenger_killer.gemspec

@@ -1,41 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'zombie_passenger_killer/version'
 
-Gem::Specification.new do |s|
-  s.name = "zombie_passenger_killer"
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+Gem::Specification.new "zombie_passenger_killer", ZombiePassengerKiller::VERSION do |s|
+  s.summary = "Guaranteed zombie passengers death"
   s.authors = ["Michael Grosser"]
-  s.date = "2012-01-05"
   s.email = "michael@grosser.it"
-  s.executables = ["zombie_passenger_killer"]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "Rakefile",
-    "Readme.md",
-    "VERSION",
-    "bin/zombie_passenger_killer",
-    "lib/zombie_passenger_killer.rb",
-    "spec/spec_helper.rb",
-    "spec/zombie_passenger_killer_spec.rb",
-    "zombie_passenger_killer.gemspec"
-  ]
   s.homepage = "http://github.com/grosser/zombie_passenger_killer"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Guaranteed zombie passengers death"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files = `git ls-files`.split("\n")
+  s.executables = ["zombie_passenger_killer"]
+  s.license = "MIT"
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zombie_passenger_killer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: []
 
 description: 
@@ -31,15 +31,16 @@ files:
 - Gemfile.lock
 - Rakefile
 - Readme.md
-- VERSION
 - 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
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Guaranteed zombie passengers death

data/VERSION

@@ -1 +0,0 @@
-0.1.3