bluepill 0.0.30 → 0.0.31

data/VERSION

@@ -1 +1 @@
-0.0.30
+0.0.31

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.30"
+  s.version = "0.0.31"
 
   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-12-27}
+  s.date = %q{2010-01-15}
   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/application.rb

@@ -78,7 +78,11 @@ module Bluepill
           begin
             client = self.socket.accept
             command, *args = client.readline.strip.split(":")
-            response = self.send(command, *args)
+            response = begin
+              self.send(command, *args)
+            rescue Exception => e
+              e
+            end
             client.write(Marshal.dump(response))
           rescue StandardError => e
             logger.err("Got exception in cmd listener: %s `%s`" % [e.class.name, e.message])

data/lib/bluepill/condition_watch.rb

@@ -18,7 +18,7 @@ module Bluepill
     end
     
     def run(pid, tick_number = Time.now.to_i)
-      if @last_ran_at.nil? || (@last_ran_at + @every) <= tick_number
+      if true || @last_ran_at.nil? || (@last_ran_at + @every) <= tick_number
         @last_ran_at = tick_number
         self.record_value(@process_condition.run(pid))
         return @fires if self.fired?

data/lib/bluepill/controller.rb

@@ -66,7 +66,19 @@ module Bluepill
           while line = socket.gets
             buffer << line
           end
-          Marshal.load(buffer)
+          if buffer.size > 0
+            response = Marshal.load(buffer)
+            if response.is_a?(Exception)
+              $stderr.puts "Received error from server:"
+              $stderr.puts response.inspect
+              $stderr.puts response.backtrace.join("\n")
+              exit(8)
+            else
+              response
+            end
+          else
+            abort("No response from server")
+          end
         end
       rescue Timeout::Error
         abort("Socket Timeout: Server may not be responding")

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/lib/example.rb

@@ -3,13 +3,12 @@ require 'bluepill'
 require 'logger'
 
 ROOT_DIR = "/tmp/bp"
-Bluepill.define_process_condition(:random_watch) do
+Bluepill.define_process_condition(:always_false) do
   def run(pid)
-    (rand * 100).to_i / 100.0
+    0
   end
   
   def check(value)
-    value > @options[:fails_at]
     false
   end
 end
@@ -71,24 +70,25 @@ Bluepill.application(:sample_app) do |app|
     end
   end
   
-  2.times do |i|
+  3.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.uid = "arya"
-      process.gid = "wheel"
+      # process.uid = "deploy"
+      # process.gid = "deploy"
 
-      process.stderr = "/tmp/err.log"      
-      process.stdout = "/tmp/err.log"
+      # process.stderr = "/tmp/err.log"      
+      # process.stdout = "/tmp/err.log"
 
+      # process.group = "grouped"
       
-      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 = "sleep 20"
+      process.start_command = "sleep 10"
       process.stop_command = "kill {{PID}}"
       process.daemonize = true
-      process.pid_file = "/tmp/p_#{process.group}_#{i}.pid"
+      process.pid_file = "/tmp/process_#{i}.pid"
       
-      process.checks :random_watch, :every => 2, :fails_at => 0.5
-      process.checks :flapping, :times => 2, :within => 900.seconds, :retry_in => 7.seconds
+      process.checks :always_false, :every => 1, :times => [20,21]
+      process.checks :flapping, :times => 200, :within => 900.seconds, :retry_in => 7.seconds
+      process.checks :mem_usage, :every => 1, :below => 300.megabytes, :times => [3,5]
+      process.checks :cpu_usage, :every => 1, :below => 3000, :times => [3,5]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -08:00
+date: 2010-01-15 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency