zombie_passenger_killer 0.2.4 → 0.2.5

data/Gemfile.lock

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

data/lib/zombie_passenger_killer/reaper.rb

@@ -27,22 +27,6 @@ module ZombiePassengerKiller
       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 }
-
-      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
@@ -63,6 +47,24 @@ module ZombiePassengerKiller
       end
     end
 
+    private
+
+    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
+
     # return array of pids reported from passenger-status command, nil if passenger-status 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 }
@@ -70,7 +72,7 @@ module ZombiePassengerKiller
     end
 
     def process_status
-      %x(ps -eo pid,pcpu,args|grep -v grep|grep '#{@pattern}').split("\n").map do |line|
+      %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}
       end

data/lib/zombie_passenger_killer/version.rb

@@ -1,3 +1,3 @@
 module ZombiePassengerKiller
-  Version = VERSION = '0.2.4'
+  Version = VERSION = '0.2.5'
 end

data/spec/zombie_passenger_killer_spec.rb

@@ -103,7 +103,7 @@ describe ZombiePassengerKiller do
     it "kills normal processes" do
       pid = start_bogus_process
       lambda{
-        killer.kill_zombie(pid)
+        killer.send(:kill_zombie, pid)
         sleep 0.1
       }.should change{ process_alive?(pid) }
     end
@@ -111,37 +111,37 @@ describe ZombiePassengerKiller do
     it "kills hanging processes" do
       pid = start_bogus_process :hang => true
       lambda{
-        killer.kill_zombie(pid)
+        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.kill_zombie(pid)
+      killer.send(:kill_zombie, pid)
       output.should include('attach:')
     end
 
     it "does not take a strace of a dead process" do
-      killer.kill_zombie(111)
+      killer.send(:kill_zombie, 111)
       output.should_not include('attach:')
     end
 
     it "does not fail with an unknown pid" do
-      killer.kill_zombie(111)
+      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.log "X"
+      killer.send(:log, "X")
       output.should == "X\n"
     end
 
     it "logs simple when :show_times is not given" do
       @options = {:show_times => true}
-      killer.log "X"
+      killer.send(:log, "X")
       output.should include(Time.now.year.to_s)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zombie_passenger_killer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -45,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4207878518223099064
+      hash: -3534877582481648676
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4207878518223099064
+      hash: -3534877582481648676
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24