passenger_reaper 0.0.1 → 0.0.2

data/bin/passenger_reaper

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'passenger_reaper'
-PassengerReaper::Runner.run(ARGV)
+PassengerReaper::Runner.run

data/lib/passenger_reaper.rb

@@ -3,21 +3,30 @@ require "passenger_reaper/ps_etime"
 require "passenger_reaper/passenger_process"
 
 module PassengerReaper
-  MINIMUM_ETIME = 600 # 10 minutes
-
   class Runner
-    def self.run(args)
-      if %W(active inactive debug status).include?(ARGV.first)
-        case ARGV.first
-        when 'active'
-          PassengerProcess.kill_stale_passengers
-        when 'inactive'
-          PassengerProcess.kill_inactive_passengers
-        when 'debug'
-          PassengerProcess.inactive_passengers_last_log_entry
-        when 'status'
-          puts "Total of passengers: #{PassengerProcess.all_passenger_pids.count}"
-          puts "Stale passengers: #{PassengerProcess.stale.count}"
+    VALID_COMMANDS = %w(old active inactive all debug status)
+
+    def self.run
+      commands = ARGV.select {|cmd| VALID_COMMANDS.include?(cmd) }
+      unless commands.empty?
+        commands.each do |arg|
+          case arg
+          when 'old'
+            PassengerProcess.kill_old_passengers
+          when 'active'
+            PassengerProcess.kill_stale_passengers
+          when 'inactive'
+            PassengerProcess.kill_inactive_passengers
+          when 'all'
+            PassengerProcess.kill_old_passengers
+            PassengerProcess.kill_stale_passengers
+            PassengerProcess.kill_inactive_passengers
+          when 'debug'
+            PassengerProcess.inactive_passengers_last_log_entry
+          when 'status'
+            puts "Total of passengers: #{PassengerProcess.all_passenger_pids.count}"
+            puts "Stale passengers: #{PassengerProcess.stale.count}"
+          end
         end
       else
         help =<<-EOF
@@ -28,8 +37,10 @@ Error: please use the following syntax:
 Commands:
 
 status    displays the number of total passenger workers and the number of active workers
+old       kills old workers that passengers has in the pool
 active    kills stale workers that passengers has in the pool
 inactive  kills workers that passenger no longer controls
+all       kills both active, inactive & old workers
 debug     shows the last log entry from each inactive worker
 
 Options:

data/lib/passenger_reaper/passenger_process.rb

@@ -2,6 +2,8 @@ require 'chronic'
 
 module PassengerReaper
   class PassengerProcess
+    MINIMUM_ETIME = 600 # 10 minutes
+
     attr_accessor :pid, :uptime
     
     def initialize(passenger_status_line)
@@ -31,6 +33,15 @@ module PassengerReaper
       passengers
     end
 
+    def self.old
+      passengers = []
+      passenger_status.each_line do |line|
+        ps = PassengerProcess.new(line)
+        passengers << ps if ps.uptime_in_seconds > MINIMUM_ETIME
+      end
+      passengers
+    end
+
     def self.stale
       stale_passengers = []
       potentially_stale_processes = active.select { |p| p.uptime_in_seconds > 600 }
@@ -46,8 +57,7 @@ module PassengerReaper
     end
     
     def self.last_log_entry(pid)
-      pwd = `pwd`.chomp
-      `grep 'rails\\[#{pid}\\]' #{pwd}/log/production.log | tail -n 1`.chomp
+      `grep 'rails\\[#{pid}\\]' #{Dir.pwd}/log/production.log | tail -n 1`.chomp
     end
     
     def self.last_log_entry_time(pid)
@@ -91,11 +101,27 @@ module PassengerReaper
       inactive_passenger_pids
     end
 
+    def self.old_passenger_pids
+      old_passenger_pids = []
+      all_passenger_pids.each do |pid|
+        raw_etime = `ps -p #{pid} --no-headers -o etime`.chomp
+        etime = PsEtime.new(raw_etime)
+        old_passenger_pids << pid unless (etime.age_in_seconds < (MINIMUM_ETIME || 600))
+      end
+      old_passenger_pids
+    end
+
     def self.kill_inactive_passengers
       inactive_passenger_pids.each do |pid|
         kill(pid)
       end
     end
+
+    def self.kill_old_passengers
+      old.each do |ps|
+        kill(ps.pid)
+      end
+    end
     
     def self.kill_stale_passengers
       stale.each do |p|

data/lib/passenger_reaper/version.rb

@@ -1,3 +1,3 @@
 module PassengerReaper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/passenger_reaper_spec.rb

@@ -20,6 +20,12 @@ EOF
     passenger.uptime.should eql('40s')
   end
   
+  it "should return old passenger processes" do
+    old_pids = PassengerReaper::PassengerProcess.old
+    old_pids.count.should eql(2)
+    old_pids.map{|p| p.pid}.should eql([14521, 14525])
+  end
+  
   it "should parse the uptime into seconds" do
     all_passenger_processes = PassengerReaper::PassengerProcess.active
     all_passenger_processes[0].uptime_in_seconds.should eql(40)

data/spec/test_helper.rb

@@ -1,2 +1 @@
-#require 'minitest/autorun'
 require 'passenger_reaper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger_reaper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70248854448020 !ruby/object:Gem::Requirement
+  requirement: &70093686377000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248854448020
+  version_requirements: *70093686377000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70248854447440 !ruby/object:Gem::Requirement
+  requirement: &70093686376280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70248854447440
+  version_requirements: *70093686376280
 description: Gemification of https://gist.github.com/596401/db750535df61e679aad69e8d9c9750f8640a234f.
 email:
 - joshbuddy@gmail.com
@@ -65,12 +65,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3239212710653592446
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3239212710653592446
 requirements: []
 rubyforge_project: passenger_reaper
 rubygems_version: 1.8.15
@@ -80,4 +86,3 @@ summary: Gemification of https://gist.github.com/596401/db750535df61e679aad69e8d
 test_files:
 - spec/passenger_reaper_spec.rb
 - spec/test_helper.rb
-has_rdoc: