passenger_mon 0.2.0 → 0.3.0

data/bin/passenger_mon

@@ -32,7 +32,7 @@ end.parse!
 # set option defaults
 options[:interval]  ||= 30
 options[:threshold] ||= 400
-options[:log]       ||= "/var/log/passenger_mong.log"
+options[:log]       ||= "/var/log/passenger_mon.log"
 options[:pidfile]   ||= "/tmp/passenger_mon.pid"
 options[:threshold] = options[:threshold].to_i
 
@@ -62,28 +62,15 @@ Signal.trap('INT') do
   abort("\n")
 end
 
-kill_attempts = {}
-
 loop do
   logger.info "Checking for naughty processes..."
   
-  results = `passenger-memory-stats`
-  results = results.split("\n").grep(/Rails/)
+  results = `passenger-memory-stats 2> /dev/null`
+  results = results.split("\n").grep(/Rack/)
 
   results.each do |res|
     pid, vm_size, vm_size_label, mem_res, *bullshit = res.strip.split(/\s+/)
-    
-    # ultimately, we need to have some logic in here that decides when
-    # it's appropriate to do a kill -9. If a process has truly run out of 
-    # control (say, it's trying to load a massive table into memory at once)
-    # then we need to be more aggressive with how we terminate the process.
     if mem_res.to_i >= options[:threshold]
-      if kill_attempts.has_key?(pid)
-        kill_attempts[pid] += 1
-      else
-        kill_attempts[pid] = 1
-      end
-
       logger.info "Killing process #{pid} using #{mem_res.to_i}mb of ram (Threshold=#{options[:threshold]}mb)"
 
       # passenger treats the USR1 signal as a graceful shutdown.

metadata

@@ -1,76 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: passenger_mon
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alex Sharp
 - Rick Bradley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-09 00:00:00 -08:00
-default_executable: 
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies: []
-
-description: Need to control the memory footprint of your passenger processes. You need passenger_mon, bro.
-email: 
+description: When you need to control the memory footprint of your passenger processes
+email:
 - ajsharp@gmail.com
-executables: 
+executables:
 - passenger_mon
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - MIT-LICENSE
-files: 
+files:
 - README.md
 - MIT-LICENSE
-- bin/passenger_mon
-has_rdoc: true
+- !binary |-
+  YmluL3Bhc3Nlbmdlcl9tb24=
 homepage: https://github.com/ajsharp/passenger_mon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Rails process monitoring for passenger 3
+summary: Rails process memory monitoring for passenger 3
 test_files: []
-
+has_rdoc: