weasel-the-memory-watcher 1.1.0 → 1.2.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.8.7-p299@memory_watch --create
+rvm use 1.9.3-p327@memory_watch --create

data/Gemfile

@@ -1,4 +1,6 @@
 # A sample Gemfile
 source "http://rubygems.org"
-gem 'wrong'
-gem 'jeweler'
+
+group :development do
+  gem 'jeweler'
+end

data/LICENSE

@@ -1,20 +1,15 @@
-Copyright (c) 2009 Curtis Schofield
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    Copyright (C) 2009,2010 Curtis Schofield
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/README.rdoc

@@ -1,17 +1,22 @@
-= memory_watch
+= Weasel
 
-Description goes here.
+Simple memory monitor - used in production with passenger to limit uptime of a service using excessive memory - as happens with ruby-1.8.7 on non ree projects
 
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+see ./bin/weasel for all the arguments that it takes
 
-== Copyright
+= Example
+
+weasel --callback "%x{kill -USR1 #{pid.to_s}}" --watch 'Rails:' --num-cycles 3 --num-over-marks 2 --callback-message 'sending SIGUSR1' --high-water-mb 440 --delay 1
+
+ the above will send sigusr1 (graceful exit) to all the processes matching 'Rails' that run over 440MB 2 out of 3
+samples.  
+
+ Samples are taken a total of 3 times with a delay of 1 second between them.
+
+ Put this in a cronjob to run every minute and you have a very simple, robust way to reap overmemory processes.
+
+ You can also combine this nicely with services that use daemontools if you don't want to write complex restart / shutdown code.
+
+= Fin
 
 Copyright (c) 2010 Curtis Schofield. See LICENSE for details.

data/Rakefile

@@ -47,12 +47,3 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "weasel #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/weasel

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+$:.push File.join(File.dirname(__FILE__),'..','lib')
 require 'optparse'
 require 'weasel'
 options = {}

data/lib/memory_watch.rb

@@ -1,15 +1,11 @@
-
 class MemoryWatch
   attr_accessor :watch_string,:high_water_pids,:callback,:high_water_mb,
                 :delay,:num_cycles,:num_over_marks,:pids,:callback_message
 
   def initialize(options)
-    self.callback         = options[:callback]             || 
-                             lambda {|pid| p pid}
-    self.callback_message = (options[:callback_message]    || 
-                             "Callback Triggered").strip
-    self.watch_string     = (options[:watch]               || 
-                             "this poem is a pomme").strip
+    self.callback         = options[:callback]             || lambda {|pid| p pid}
+    self.callback_message = (options[:callback_message]    || "Callback Triggered").strip
+    self.watch_string     = Regexp.escape((options[:watch] || "this poem is a pomme").strip)
     self.delay            = options[:delay]                || 60
     self.num_cycles       = options[:num_cycles]           || 3
     self.num_over_marks   = options[:num_over_marks]       || 2
@@ -43,7 +39,7 @@ class MemoryWatch
     _run.each { |pid|
       memory_usage = %x{ps -o rss= -p #{pid}}.to_i # KB
       if memory_usage > self.high_water_mb * 1024 # 750MB
-        puts "WARNING - Process #{pid} hit high water mark"
+        puts "WARNING - Process #{pid} hit high water mark at #{memory_usage / 1024}MB"
         self.high_water_pids[pid] ||= []
         self.high_water_pids[pid] << memory_usage
       end

data/test/helper.rb

@@ -1,11 +1,8 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'test/unit'
-require "bundler/setup"
-require 'wrong/adapters/test_unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'memory_watch'
-
-class Test::Unit::TestCase
-end
+class Test::Unit::TestCase; end

data/test/test_memory_watch.rb

@@ -1,21 +1,26 @@
 require 'helper'
 class TestMemoryWatch < Test::Unit::TestCase
-  def test_watches_self
-    cmd = %q{ruby ./bin/weasel --delay 999999 --num_cycles 9900000099}
-    pid = fork { %x{#{cmd}} }
+  def setup
+    @cmd = %q{ruby ./bin/weasel --delay 999999 --num_cycles 9900000099}
+    pid = fork { %x{#{@cmd}} }
     Process.detach(pid)
-    wm = MemoryWatch.new(:watch => cmd , :high_water_mb => 0.01,:delay => 0.1, :num_cycles => 1)
-    wm.cycle
-    assert { 
-      wm.high_water_pids.size == 1
-    }
-    wm.pids.each do |pid|
+  end
+
+  def teardown
+    @wm.pids.each do |pid|
       %x{kill -9 #{pid}}
     end
   end
+
+  def test_watches_self
+    @wm = MemoryWatch.new(:watch => @cmd , :high_water_mb => 0.02,:delay => 0.1, :num_cycles => 1)
+    @wm.cycle
+    assert_equal 1, @wm.high_water_pids.size
+  end
+
   def test_runs_callback
     test_magiggy = false
-    wm = MemoryWatch.new(:watch => File.basename(__FILE__), 
+    @wm = MemoryWatch.new(:watch => @cmd,
                          :high_water_mb => 0,
                          :num_cycles => 1,
                          :delay => 0.01,
@@ -24,10 +29,7 @@ class TestMemoryWatch < Test::Unit::TestCase
                             test_magiggy = pid
                          },
                          :callback_message => 'Message')
-    wm.cycle
-    assert { 
-      wm.high_water_pids.include? test_magiggy
-    }
+    @wm.cycle
+    assert_includes @wm.high_water_pids, test_magiggy
   end
 end
-

metadata

@@ -1,76 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: weasel-the-memory-watcher
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Curtis Schofield
 - www.goodreads.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-22 00:00:00 -08:00
-default_executable: weasel
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: wrong
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+date: 2013-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dedicated to my dead cat and goodreads.com
 email: github.com@robotarmyma.de
-executables: 
+executables:
 - weasel
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .rvmrc
 - Gemfile
@@ -83,40 +65,31 @@ files:
 - lib/weasel.rb
 - test/helper.rb
 - test/test_memory_watch.rb
-has_rdoc: true
 homepage: http://github.com/robotarmy/weasel
 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: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 686863708920555186
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Weasel : The memory wacher"
-test_files: 
-- test/helper.rb
-- test/test_memory_watch.rb
+summary: ! 'Weasel : The memory wacher'
+test_files: []