bluepill 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/bin/bluepill

@@ -29,8 +29,8 @@ OptionParser.new do |opts|
     puts "bluepill, version #{Bluepill::VERSION}"
     exit
   end
-    
-  opts.on_tail('-h','--help', 'Show this message') do
+  
+  help = lambda do
     puts opts
     puts
     puts "Commands:"
@@ -46,6 +46,9 @@ OptionParser.new do |opts|
     puts "See http://github.com/arya/bluepill for README"
     exit
   end
+    
+  opts.on_tail('-h','--help', 'Show this message', &help)
+  help.call if ARGV.empty?
 end.parse!
 
 APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log)

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2009-11-24}
   s.default_executable = %q{bluepill}
   s.description = %q{Bluepill keeps your daemons up while taking up as little resources as possible. After all you probably want the resources of your server to be used by whatever daemons you are running rather than the thing that's supposed to make sure they are brought back up, should they die or misbehave.}
   s.email = %q{entombedvirus@gmail.com}

data/lib/bluepill/condition_watch.rb

@@ -48,7 +48,7 @@ module Bluepill
       # use (@history[(@history_index - 1)..1] + @history[0..(@history_index - 1)]).
       #       collect {|v| "#{v[0]}#{v[1] ? '' : '*'}"}.join(", ")
       # but that's gross so... it's gonna be out of order till we figure out a better way to get it in order
-      data = @history.collect {|v| "#{v[0]}#{v[1] ? '' : '*'}" if v}.compact.join(", ")
+      data = @history.collect {|v| "#{@process_condition.format_value(v[0])}#{v[1] ? '' : '*'}" if v}.compact.join(", ")
       "#{@name}: [#{data}]"
     end
   end

data/lib/bluepill/process.rb

@@ -135,7 +135,7 @@ module Bluepill
     # State machine methods
     def dispatch!(event)
       @event_mutex.synchronize do
-        self.send("#{event}!")
+        self.send("#{event}")
       end
     end
     
@@ -317,7 +317,8 @@ module Bluepill
       @actual_pid ||= begin
         if pid_file
           if File.exists?(pid_file)
-            File.read(pid_file).to_i 
+            str = File.read(pid_file)
+            str.to_i if str.size > 0
           else
             logger.warning("pid_file #{pid_file} does not exist or cannot be read")
             nil

data/lib/bluepill/process_conditions/mem_usage.rb

@@ -1,6 +1,11 @@
 module Bluepill
   module ProcessConditions
     class MemUsage < ProcessCondition
+      MB = 1024 ** 2
+      FORMAT_STR = "%d%s"
+      MB_LABEL = "MB"
+      KB_LABEL = "KB"
+      
       def initialize(options = {})
         @below = options[:below]
       end
@@ -13,6 +18,14 @@ module Bluepill
       def check(value)
         value.kilobytes < @below
       end
+      
+      def format_value(value)
+        if value.kilobytes >= MB
+          FORMAT_STR % [(value / 1024).round, MB_LABEL]
+        else
+          FORMAT_STR % [value, KB_LABEL]
+        end
+      end
     end
   end
 end

data/lib/bluepill/process_conditions/process_condition.rb

@@ -8,6 +8,10 @@ module Bluepill
       def check(value)
         raise "Implement in subclass!"
       end
+      
+      def format_value(value)
+        value
+      end
     end
   end
 end

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/example.rb

@@ -63,7 +63,7 @@ Bluepill.application(:sample_app) do |app|
   
   1.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.uid = "rohith"
+      process.uid = "arya"
       process.gid = "wheel"
 
       process.stderr = "/tmp/err.log"      
@@ -71,11 +71,22 @@ Bluepill.application(:sample_app) do |app|
 
       
       process.group = "grouped"
-      process.start_command = %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
+      # process.start_command = %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
+      process.start_command = "sleep 10"
       process.daemonize = true
-      process.pid_file = "/tmp/noperm/p_#{process.group}_#{i}.pid"
+      process.pid_file = "/tmp/p_#{process.group}_#{i}.pid"
       
       # process.checks :always_true, :every => 5
+      process.checks :cpu_usage, 
+        :every => 10, 
+        :below => 0.5, 
+        :times => [5, 5]
+      
+      process.checks :mem_usage, 
+        :every => 3, 
+        :below => 600.megabytes, 
+        :times => [3, 5], 
+        :fires => [:stop]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -08:00
+date: 2009-11-24 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency