bluepill 0.0.36 → 0.0.37

data/README.md

@@ -211,6 +211,13 @@ By default, bluepill uses syslog local6 facility as described in the installatio
 
 Keep in mind that you still need to set up log rotation (described in the installation section) to keep the log file from growing huge.
     
+### Extra options
+You can run bluepill in the foreground:
+
+    Bluepill.application("app_name", :foreground => true) do |app|
+      # ...
+    end
+
 ## Links
 Code: [http://github.com/arya/bluepill](http://github.com/arya/bluepill)  
 Bugs/Features: [http://github.com/arya/bluepill/issues](http://github.com/arya/bluepill/issues)  

data/VERSION

@@ -1 +1 @@
-0.0.36
+0.0.37

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.36"
+  s.version = "0.0.37"
 
   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-02-28}
+  s.date = %q{2010-03-14}
   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}
@@ -50,7 +50,8 @@ Gem::Specification.new do |s|
      "lib/bluepill/triggers/flapping.rb",
      "lib/bluepill/util/rotational_array.rb",
      "lib/bluepill/version.rb",
-     "lib/example.rb"
+     "lib/example.rb",
+     "lib/runit_example.rb"
   ]
   s.homepage = %q{http://github.com/arya/bluepill}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/bluepill/application.rb

@@ -11,6 +11,7 @@ module Bluepill
     def initialize(name, options = {})
       self.name = name
 
+      @foreground   = options[:foreground]
       self.log_file = options[:log_file]      
       self.base_dir = options[:base_dir] || '/var/bluepill'
       self.pid_file = File.join(self.base_dir, 'pids', self.name + ".pid")
@@ -18,7 +19,7 @@ module Bluepill
 
       self.groups = {}
       
-      self.logger = Bluepill::Logger.new(:log_file => self.log_file).prefix_with(self.name)
+      self.logger = Bluepill::Logger.new(:log_file => self.log_file, :stdout => foreground?).prefix_with(self.name)
       
       self.setup_signal_traps
       self.setup_pids_dir
@@ -26,6 +27,10 @@ module Bluepill
       @mutex = Mutex.new
     end
 
+    def foreground?
+      !!@foreground
+    end
+
     def mutex(&b)
       @mutex.synchronize(&b)
     end
@@ -109,13 +114,13 @@ module Bluepill
     def start_server
       self.kill_previous_bluepill
       
-      Daemonize.daemonize
+      Daemonize.daemonize unless foreground?
       
       self.logger.reopen
       
       $0 = "bluepilld: #{self.name}"
       
-      self.groups.each {|_, group| group.boot }
+      self.groups.each {|_, group| group.determine_initial_state }
 
       
       self.write_pid_file
@@ -192,4 +197,4 @@ module Bluepill
       File.open(self.pid_file, 'w') { |x| x.write(::Process.pid) }
     end
   end
-end
+end

data/lib/bluepill/dsl.rb

@@ -38,19 +38,21 @@ module Bluepill
         end
       end
       
+      def create_child_process_template
+        if @child_process_block
+          child_proxy = self.class.new
+          # Children inherit some properties of the parent
+          [:start_grace_time, :stop_grace_time, :restart_grace_time].each do |attribute|
+            child_proxy.send("#{attributes}=", @attributes[attribute]) if @attributes.key?(attribute)
+          end
+          @child_process_block.call(child_proxy)
+          validate_child_process(child_proxy)
+          @attributes[:child_process_template] = child_proxy.to_process(nil)
+        end
+      end
+      
       def monitor_children(&child_process_block)
-        child_proxy = self.class.new
-        
-        # Children inherit some properties of the parent
-        child_proxy.start_grace_time = @attributes[:start_grace_time]
-        child_proxy.stop_grace_time = @attributes[:stop_grace_time]
-        child_proxy.restart_grace_time = @attributes[:restart_grace_time]
-        
-        child_process_block.call(child_proxy)
-        validate_child_process(child_proxy)
-        
-        @attributes[:child_process_template] = child_proxy.to_process(nil)
-        # @attributes[:child_process_template].freeze
+        @child_process_block = child_process_block
         @attributes[:monitor_children] = true
       end
       
@@ -108,13 +110,15 @@ module Bluepill
       def process(process_name, &process_block)
         process_proxy = @@process_proxy.new(process_name)
         process_block.call(process_proxy)
+        process_proxy.create_child_process_template
+        
         set_app_wide_attributes(process_proxy)
         
         assign_default_pid_file(process_proxy, process_name)
         
         validate_process(process_proxy, process_name)
         
-        group = process_proxy.attributes.delete(:group)        
+        group = process_proxy.attributes.delete(:group)
         process = process_proxy.to_process(process_name)
         
         

data/lib/bluepill/group.rb

@@ -19,9 +19,15 @@ module Bluepill
         process.tick
       end
     end
+    
+    def determine_initial_state
+      self.processes.each do |process|
+        process.determine_initial_state
+      end
+    end
 
     # proxied events
-    [:start, :unmonitor, :stop, :restart, :boot].each do |event|
+    [:start, :unmonitor, :stop, :restart].each do |event|
       class_eval <<-END
         def #{event}(process_name = nil)
           threads = []

data/lib/bluepill/logger.rb

@@ -3,9 +3,10 @@ module Bluepill
     LOG_METHODS = [:emerg, :alert, :crit, :err, :warning, :notice, :info, :debug]
     
     def initialize(options = {})
-      @options = options
-      @logger = options[:logger] || self.create_logger
-      @prefix = options[:prefix]
+      @options  = options
+      @logger   = options[:logger] || self.create_logger
+      @prefix   = options[:prefix]
+      @stdout   = options[:stdout]
       @prefixes = {}
     end
     
@@ -15,8 +16,12 @@ module Bluepill
           if @logger.is_a?(self.class)
             @logger.#{method}(msg, [@prefix] + prefix)
           else
-            prefix = prefix.size > 0 ? "[\#{prefix.compact.join(':')}] " : ""
-            @logger.#{method}("\#{prefix}\#{msg}")
+            s_prefix = prefix.size > 0 ? "[\#{prefix.compact.join(':')}] " : ""
+            if @stdout
+              $stdout.puts("[#{method}]: \#{s_prefix}\#{msg}")
+              $stdout.flush
+            end
+            @logger.#{method}("\#{s_prefix}\#{msg}")
           end
         end
       END
@@ -54,4 +59,4 @@ module Bluepill
       end
     end 
   end
-end
+end

data/lib/bluepill/process.rb

@@ -93,18 +93,16 @@ module Bluepill
       @children = []
       @statistics = ProcessStatistics.new
       
-      @monitor_children = options[:monitor_children] || false
-      
-      %w(start_grace_time stop_grace_time restart_grace_time).each do |grace|
-        instance_variable_set("@#{grace}", options[grace.to_sym] || 3)
-      end
+      # 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
       
       CONFIGURABLE_ATTRIBUTES.each do |attribute_name|
         self.send("#{attribute_name}=", options[attribute_name]) if options.has_key?(attribute_name)
       end
-      
+            
       # Let state_machine do its initialization stuff
-      super()
+      super() # no arguments intentional
     end
 
     def tick
@@ -118,9 +116,9 @@ module Bluepill
       super
 
       if self.up?
-        run_watches
+        self.run_watches
         
-        if monitor_children?
+        if self.monitor_children?
           refresh_children!
           children.each {|child| child.tick}
         end
@@ -194,31 +192,28 @@ module Bluepill
       end
     end
     
+    def determine_initial_state
+      if self.process_running?(true)
+        self.state = 'up'
+      else
+        # TODO: or "unmonitored" if bluepill was started in no auto-start mode.
+        self.state = 'down'
+      end
+    end
+    
     def handle_user_command(cmd)
       case cmd
-      when "boot"
-        # This is only called when bluepill is initially starting up
-        if process_running?(true)
-          # process was running even before bluepill was
-          self.state = 'up'
-        else
-          self.state = 'starting'
-        end
-        
       when "start"
-        if process_running?(true) && daemonize?
-          logger.warning("Refusing to re-run start command on an automatically daemonized process to preserve currently running process pid file.")
-          return
+        if self.process_running?(true)
+          logger.warning("Refusing to re-run start command on an already running process.")
+        else
+          dispatch!(:start, "user initiated")
         end
-        dispatch!(:start, "user initiated")
-
       when "stop"
         stop_process
         dispatch!(:unmonitor, "user initiated")
-        
       when "restart"
         restart_process
-        
       when "unmonitor"
         # When the user issues an unmonitor cmd, reset any triggers so that
         # scheduled events gets cleared
@@ -229,8 +224,10 @@ module Bluepill
     
     # System Process Methods
     def process_running?(force = false)
-      @process_running = nil if force
+      @process_running = nil if force # clear existing state if forced
+      
       @process_running ||= signal_process(0)
+      # the process isn't running, so we should clear the PID
       self.clear_pid unless @process_running
       @process_running
     end
@@ -258,7 +255,7 @@ module Bluepill
     
     def stop_process      
       if stop_command
-        cmd = process_command(stop_command)
+        cmd = self.prepare_command(stop_command)
         logger.warning "Executing stop command: #{cmd}"
         
         with_timeout(stop_grace_time) do
@@ -281,7 +278,7 @@ module Bluepill
     
     def restart_process
       if restart_command
-        cmd = process_command(restart_command)
+        cmd = self.prepare_command(restart_command)
         
         logger.warning "Executing restart command: #{cmd}"
         
@@ -384,8 +381,8 @@ module Bluepill
       Marshal.load(Marshal.dump(self))
     end
     
-    def process_command(cmd)
-      cmd.to_s.gsub("{{PID}}", actual_pid.to_s)
+    def prepare_command(command)
+      command.to_s.gsub("{{PID}}", actual_pid.to_s)
     end
     
     def system_command_options

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/lib/example.rb

@@ -15,7 +15,7 @@ end
 
 # Watch with 
 # watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:sample_app) do |app|
+Bluepill.application(:sample_app, :foreground => true) do |app|
   0.times do |i|
     app.process("process_#{i}") do |process|
       process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
@@ -70,7 +70,7 @@ Bluepill.application(:sample_app) do |app|
     end
   end
   
-  3.times do |i|
+  1.times do |i|
     app.process("group_process_#{i}") do |process|
       # process.uid = "deploy"
       # process.gid = "deploy"
@@ -79,6 +79,9 @@ Bluepill.application(:sample_app) do |app|
       # 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}}"

data/lib/runit_example.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'bluepill'
+require 'logger'
+
+# ATTENTION:
+# You must declare only one application per config when foreground mode specified
+
+# 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"
+      
+    process.start_command = "sv start opscode-agent"
+    process.stop_command = "sv stop opscode-agent"
+      
+    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
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-03-14 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - lib/bluepill/util/rotational_array.rb
 - lib/bluepill/version.rb
 - lib/example.rb
+- lib/runit_example.rb
 has_rdoc: true
 homepage: http://github.com/arya/bluepill
 licenses: []