bluepill 0.0.38 → 0.0.39

data/Rakefile

@@ -40,6 +40,7 @@ end
 
 
 namespace :version do
+  desc "Update version of Bluepill in source code"
   task :update_file do
     version = File.read("VERSION").strip
     File.open("lib/bluepill/version.rb", "w") do |file|

data/VERSION

@@ -1 +1 @@
-0.0.38
+0.0.39

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.38"
+  s.version = "0.0.39"
 
   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{2010-05-31}
+  s.date = %q{2010-08-02}
   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}
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/bluepill/process_conditions.rb",
      "lib/bluepill/process_conditions/always_true.rb",
      "lib/bluepill/process_conditions/cpu_usage.rb",
+     "lib/bluepill/process_conditions/http.rb",
      "lib/bluepill/process_conditions/mem_usage.rb",
      "lib/bluepill/process_conditions/process_condition.rb",
      "lib/bluepill/process_statistics.rb",

data/lib/bluepill.rb

@@ -9,7 +9,6 @@ require 'logger'
 require 'active_support/inflector'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/numeric'
-require 'active_support/core_ext/object/misc'
 require 'active_support/duration'
 
 require 'bluepill/application'
@@ -29,4 +28,4 @@ require "bluepill/process_conditions"
 
 require "bluepill/util/rotational_array"
 
-require "bluepill/version"
+require "bluepill/version"

data/lib/bluepill/dsl.rb

@@ -75,7 +75,7 @@ module Bluepill
       @@process_proxy = process_proxy
       @@process_keys = Hash.new # because I don't want to require Set just for validations
       @@pid_files = Hash.new
-      attr_accessor :working_dir, :uid, :gid
+      attr_accessor :working_dir, :uid, :gid, :environment
       
       def validate_process(process, process_name)
         # validate uniqueness of group:process
@@ -127,7 +127,7 @@ module Bluepill
       end
       
       def set_app_wide_attributes(process_proxy)
-        [:working_dir, :uid, :gid].each do |attribute|
+        [:working_dir, :uid, :gid, :environment].each do |attribute|
           unless process_proxy.attributes.key?(attribute)
             process_proxy.attributes[attribute] = self.send(attribute)
           end
@@ -146,4 +146,4 @@ module Bluepill
     yield(app_proxy.new)
     app.load
   end
-end
+end

data/lib/bluepill/process.rb

@@ -15,6 +15,7 @@ module Bluepill
       :daemonize, 
       :pid_file, 
       :working_dir,
+      :environment,
       
       :start_grace_time, 
       :stop_grace_time, 
@@ -96,6 +97,7 @@ module Bluepill
       # These defaults are overriden below if it's configured to be something else.
       @monitor_children =  false
       @start_grace_time = @stop_grace_time = @restart_grace_time = 3
+      @environment = {}
       
       CONFIGURABLE_ATTRIBUTES.each do |attribute_name|
         self.send("#{attribute_name}=", options[attribute_name]) if options.has_key?(attribute_name)
@@ -390,6 +392,7 @@ module Bluepill
         :uid         => self.uid, 
         :gid         => self.gid, 
         :working_dir => self.working_dir,
+        :environment => self.environment,
         :pid_file    => self.pid_file,
         :logger      => self.logger,
         :stdin       => self.stdin,
@@ -408,4 +411,4 @@ module Bluepill
     end
   end
 end
- 
+ 

data/lib/bluepill/process_conditions.rb

@@ -1,7 +1,7 @@
 module Bluepill
   module ProcessConditions    
     def self.[](name)
-      "#{self}::#{name.to_s.camelcase}".constantize
+      const_get(name.to_s.camelcase)
     end
   end
 end

data/lib/bluepill/process_conditions/http.rb

@@ -0,0 +1,52 @@
+require 'net/http'
+require 'uri'
+
+module Bluepill
+  module ProcessConditions
+    class Http < ProcessCondition
+      def initialize(options = {})
+        @uri = URI.parse(options[:url])
+        @kind = case options[:kind]
+                  when Fixnum then Net::HTTPResponse::CODE_TO_OBJ[options[:kind].to_s]
+                  when String, Symbol then Net.const_get("HTTP#{options[:kind].to_s.camelize}")
+                else
+                  Net::HTTPSuccess
+                end
+        @pattern = options[:pattern] || nil
+        @open_timeout = (options[:open_timeout] || options[:timeout] || 5).to_i
+        @read_timeout = (options[:read_timeout] || options[:timeout] || 5).to_i
+      end
+
+      def run(pid)
+        session = Net::HTTP.new(@uri.host, @uri.port)
+        session.open_timeout = @open_timeout
+        session.read_timeout = @read_timeout
+        hide_net_http_bug do
+          session.start do |http|
+            http.get(@uri.path)
+          end
+        end
+      rescue
+        $!
+      end
+
+      def check(value)
+        return false unless value.kind_of?(@kind)
+        return true  unless @pattern
+        return false unless value.class.body_permitted?
+        @pattern === value.body
+      end
+
+    private
+      def hide_net_http_bug
+        yield
+      rescue NoMethodError => e
+        if e.to_s =~ /#{Regexp.escape(%q|undefined method `closed?' for nil:NilClass|)}/
+          raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{@uri.scheme}://#{@uri.host}:#{@uri.port}"
+        else
+          raise
+        end
+      end
+    end
+  end
+end

data/lib/bluepill/system.rb

@@ -33,7 +33,7 @@ module Bluepill
     end
     
     def get_children(parent_pid)
-      returning(Array.new) do |child_pids|
+      Array.new.tap do |child_pids|
         ps_axu.each_pair do |pid, chunks| 
           child_pids << chunks[IDX_MAP[:pid]].to_i if chunks[IDX_MAP[:ppid]].to_i == parent_pid.to_i
         end
@@ -68,6 +68,7 @@ module Bluepill
         to_daemonize = lambda do
           # Setting end PWD env emulates bash behavior when dealing with symlinks
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
+          options[:environment].each { |key, value| ENV[key] = value } if options[:environment]
           
           redirect_io(*options.values_at(:stdin, :stdout, :stderr))
           
@@ -114,6 +115,7 @@ module Bluepill
           drop_privileges(options[:uid], options[:gid])
           
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
+          options[:environment].each { |key, value| ENV[key] = value } if options[:environment]
           
           # close unused fds so ancestors wont hang. This line is the only reason we are not
           # using something like popen3. If this fd is not closed, the .read call on the parent
@@ -222,4 +224,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

data/lib/example.rb

@@ -3,19 +3,10 @@ require 'bluepill'
 require 'logger'
 
 ROOT_DIR = "/tmp/bp"
-Bluepill.define_process_condition(:always_false) do
-  def run(pid)
-    0
-  end
-  
-  def check(value)
-    false
-  end
-end
 
 # Watch with 
 # watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:sample_app, :foreground => true) do |app|
+Bluepill.application(:sample_app) do |app|
   0.times do |i|
     app.process("process_#{i}") do |process|
       process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
@@ -72,26 +63,19 @@ Bluepill.application(:sample_app, :foreground => true) do |app|
   
   1.times do |i|
     app.process("group_process_#{i}") do |process|
-      # process.uid = "deploy"
-      # process.gid = "deploy"
+      process.uid = "rohith"
+      process.gid = "wheel"
 
-      # process.stderr = "/tmp/err.log"      
-      # process.stdout = "/tmp/err.log"
+      process.stderr = "/tmp/err.log"      
+      process.stdout = "/tmp/err.log"
 
-      # process.group = "grouped"
-      process.monitor_children do |child_process|
-        child_process.stop_command = "kill -QUIT {{PID}}"
-      end
       
-      process.start_command = "ruby /tmp/foo.rb"
-      process.stop_command = "kill {{PID}}"
+      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.daemonize = true
-      process.pid_file = "/tmp/process_#{i}.pid"
-      process.working_dir = "/tmp"
-      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]
+      process.pid_file = "/tmp/noperm/p_#{process.group}_#{i}.pid"
+      
+      # process.checks :always_true, :every => 5
     end
   end
 end

data/lib/runit_example.rb

@@ -4,21 +4,22 @@ require 'logger'
 
 # ATTENTION:
 # You must declare only one application per config when foreground mode specified
+#
+# http://github.com/akzhan/runit-man used as example of monitored application.
 
-# Watch with 
-# watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:opscode_agent, :foreground => true) do |app|
-  app.process("opscode_agent") do |process|
-    process.pid_file = "/etc/service/opscode-agent/supervise/pid"
+Bluepill.application(:runit_man, :foreground => true) do |app|
+  app.process("runit-man") do |process|
+    process.pid_file = "/etc/service/runit-man/supervise/pid"
       
-    process.start_command = "sv start opscode-agent"
-    process.stop_command = "sv stop opscode-agent"
+    process.start_command   = "/usr/bin/sv start runit-man"
+    process.stop_command    = "/usr/bin/sv stop runit-man"
+    process.restart_command = "/usr/bin/sv restart runit-man"
       
-    process.start_grace_time = 1.seconds
+    process.start_grace_time   = 1.seconds
     process.restart_grace_time = 7.seconds
-    process.stop_grace_time = 7.seconds
-      
-    # process.checks :cpu_usage, :every => 10, :below => 0.5, :times => [5, 5]
-    process.checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
+    process.stop_grace_time    = 7.seconds
+
+    process.checks :http, :within => 30.seconds, :retry_in => 7.seconds, :every => 30.seconds,
+      :url => 'http://localhost:4567/', :kind => :success, :pattern => /html/, :timeout => 3.seconds
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 0
-  - 38
-  version: 0.0.38
+  - 39
+  version: 0.0.39
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -07:00
+date: 2010-08-02 00:00:00 -07:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,7 @@ files:
 - lib/bluepill/process_conditions.rb
 - lib/bluepill/process_conditions/always_true.rb
 - lib/bluepill/process_conditions/cpu_usage.rb
+- lib/bluepill/process_conditions/http.rb
 - lib/bluepill/process_conditions/mem_usage.rb
 - lib/bluepill/process_conditions/process_condition.rb
 - lib/bluepill/process_statistics.rb