bluepill 0.0.28 → 0.0.30

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.30

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.28"
+  s.version = "0.0.30"
 
   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-26}
+  s.date = %q{2009-12-27}
   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}
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/bluepill/process_conditions/cpu_usage.rb",
      "lib/bluepill/process_conditions/mem_usage.rb",
      "lib/bluepill/process_conditions/process_condition.rb",
+     "lib/bluepill/process_statistics.rb",
      "lib/bluepill/socket.rb",
      "lib/bluepill/system.rb",
      "lib/bluepill/trigger.rb",

data/lib/bluepill.rb

@@ -16,6 +16,7 @@ require 'bluepill/application'
 require 'bluepill/controller'
 require 'bluepill/socket'
 require "bluepill/process"
+require "bluepill/process_statistics"
 require "bluepill/group"
 require "bluepill/logger"
 require "bluepill/condition_watch"

data/lib/bluepill/application.rb

@@ -1,6 +1,6 @@
 module Bluepill
   class Application
-    PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor]
+    PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor, :status]
     
     attr_accessor :name, :logger, :base_dir, :socket, :pid_file
     attr_accessor :groups, :work_queue
@@ -33,49 +33,6 @@ module Bluepill
       end
     end
     
-    def status
-      buffer = []
-      depth = 0
-      
-      if self.groups.has_key?(nil)
-        self.groups[nil].processes.each do |p|
-          buffer << "%s%s(pid:%s): %s" % [" " * depth, p.name, p.actual_pid.inspect, p.state]
-
-          if p.monitor_children?
-            depth += 2
-            p.children.each do |c|
-              buffer << "%s%s: %s" % [" " * depth, c.name, c.state]
-            end
-            depth -= 2
-          end
-        end
-      end
-
-      self.groups.each do |group_name, group|
-        next if group_name.nil?
-
-        buffer << "\n#{group_name}"
-
-        group.processes.each do |p|
-          depth += 2
-
-          buffer << "%s%s(pid:%s): %s" % [" " * depth, p.name, p.actual_pid.inspect, p.state]
-
-          if p.monitor_children?
-            depth += 2
-            p.children.each do |c|
-              buffer << "%s%s: %s" % [" " * depth, c.name, c.state]
-            end
-            depth -= 2
-          end
-
-          depth -= 2
-        end
-      end
-
-      buffer.join("\n")
-    end
-    
     PROCESS_COMMANDS.each do |command|
       class_eval <<-END
         def #{command}(group_name = nil, process_name = nil)

data/lib/bluepill/controller.rb

@@ -20,6 +20,8 @@ module Bluepill
     
     def handle_command(application, command, *args)
       case command.to_sym
+      when :status
+        puts self.send_to_daemon(application, :status, *args)
       when *Application::PROCESS_COMMANDS
         # these need to be sent to the daemon and the results printed out
         affected = self.send_to_daemon(application, command, *args)
@@ -31,8 +33,6 @@ module Bluepill
             puts "  #{process}"
           end
         end
-      when :status
-        puts self.send_to_daemon(application, :status, *args)
       when :quit
         pid = pid_for(application)
         if System.pid_alive?(pid)

data/lib/bluepill/dsl.rb

@@ -1,5 +1,10 @@
 require 'ostruct'
 module Bluepill
+  def self.define_process_condition(name, &block)
+    klass = Class.new(ProcessConditions::ProcessCondition, &block)
+    ProcessConditions.const_set("#{name.to_s.camelcase}", klass)
+  end
+  
   def self.application(app_name, options = {}, &block)
     app = Application.new(app_name.to_s, options, &block)
    

data/lib/bluepill/group.rb

@@ -36,5 +36,30 @@ module Bluepill
         end      
       END
     end
+    
+    def status(process_name = nil)
+      lines = []
+      if process_name.nil?
+        prefix = self.name ? "  " : ""
+        lines << "#{self.name}:" if self.name
+      
+        self.processes.each do |process|
+          lines << "%s%s(pid:%s): %s" % [prefix, process.name, process.actual_pid, process.state]
+          if process.monitor_children?
+            process.children.each do |child|
+              lines << "  %s%s: %s" % [prefix, child.name, child.state]
+            end
+          end
+        end
+      else
+        self.processes.each do |process|
+          next if process_name != process.name
+          lines << "%s%s(pid:%s): %s" % [prefix, process.name, process.actual_pid, process.state]
+          lines << process.statistics.to_s
+        end
+      end
+      lines << ""
+    end
+    
   end
 end

data/lib/bluepill/process.rb

@@ -29,7 +29,7 @@ module Bluepill
     
     attr_accessor :name, :watches, :triggers, :logger, :skip_ticks_until
     attr_accessor *CONFIGURABLE_ATTRIBUTES
-    attr_reader :children
+    attr_reader :children, :statistics
     
     state_machine :initial => :unmonitored do
       # These are the idle states, i.e. only an event (either external or internal) will trigger a transition.
@@ -91,6 +91,7 @@ module Bluepill
       @watches = []
       @triggers = []
       @children = []
+      @statistics = ProcessStatistics.new
       
       @monitor_children = options[:monitor_children] || false
       
@@ -133,8 +134,9 @@ module Bluepill
     end
     
     # State machine methods
-    def dispatch!(event)
+    def dispatch!(event, reason = nil)
       @event_mutex.synchronize do
+        @statistics.record_event(event, reason)
         self.send("#{event}")
       end
     end
@@ -181,12 +183,14 @@ module Bluepill
         thread.join
         if thread[:events].size > 0
           logger.info "#{watch.name} dispatched: #{thread[:events].join(',')}"
-          events << thread[:events]
+          thread[:events].each do |event|
+            events << [event, watch.to_s]
+          end
         end
         events
-      end.flatten.uniq.each do |event|
+      end.each do |(event, reason)|
         break if @transitioned
-        self.dispatch!(event)
+        self.dispatch!(event, reason)
       end
     end
     
@@ -206,11 +210,11 @@ module Bluepill
           logger.warning("Refusing to re-run start command on an automatically daemonized process to preserve currently running process pid file.")
           return
         end
-        dispatch!(:start)
+        dispatch!(:start, "user initiated")
 
       when "stop"
         stop_process
-        dispatch!(:unmonitor)
+        dispatch!(:unmonitor, "user initiated")
         
       when "restart"
         restart_process
@@ -219,7 +223,7 @@ module Bluepill
         # When the user issues an unmonitor cmd, reset any triggers so that
         # scheduled events gets cleared
         triggers.each {|t| t.reset! }
-        dispatch!(:unmonitor)
+        dispatch!(:unmonitor, "user initiated")
       end
     end
     

data/lib/bluepill/process_conditions/process_condition.rb

@@ -1,6 +1,10 @@
 module Bluepill
   module ProcessConditions
     class ProcessCondition  
+      def initialize(options = {})
+        @options = options
+      end
+      
       def run(pid)
         raise "Implement in subclass!"
       end

data/lib/bluepill/process_statistics.rb

@@ -0,0 +1,24 @@
+module Bluepill
+  class ProcessStatistics    
+    STRFTIME = "%m/%d/%Y %H:%I:%S"
+    # possibly persist this data.
+    def initialize
+      @events = Util::RotationalArray.new(10)
+    end
+
+    def record_event(event, reason)
+      @events.push([event, reason, Time.now])
+    end
+
+    def to_s
+      str = []
+      @events.each do |(event, reason, time)|
+        str << "  #{event} at #{time.strftime(STRFTIME)} - #{reason || "unspecified"}"
+      end
+      if str.size > 0
+        str << "event history:"
+      end
+      str.reverse.join("\n")
+    end
+  end
+end

data/lib/bluepill/trigger.rb

@@ -27,7 +27,7 @@ module Bluepill
     end
     
     def dispatch!(event)
-      self.process.dispatch!(event)
+      self.process.dispatch!(event, self.class.name.split("::").last)
     end
     
     def schedule_event(event, delay)
@@ -36,7 +36,7 @@ module Bluepill
         begin
           sleep delay.to_f
           trigger.logger.info("Retrying from flapping")
-          trigger.process.dispatch!(event)
+          trigger.dispatch!(event)
           trigger.mutex.synchronize do
             trigger.scheduled_events.delete_if { |_, thread| thread == Thread.current }
           end

data/lib/bluepill/util/rotational_array.rb

@@ -48,6 +48,14 @@ module Bluepill
       super
      end
      
+     def each(&block)
+       times = @counter >= @capacity ? @capacity : @counter
+       start = @counter >= @capacity ? rotational_idx(@counter) : 0
+       times.times do |i|
+         block.call(self[rotational_idx(start + i)])
+       end
+     end
+     
      private
      
      def rotational_idx(idx)

data/lib/bluepill/version.rb

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

data/lib/example.rb

@@ -3,6 +3,16 @@ require 'bluepill'
 require 'logger'
 
 ROOT_DIR = "/tmp/bp"
+Bluepill.define_process_condition(:random_watch) do
+  def run(pid)
+    (rand * 100).to_i / 100.0
+  end
+  
+  def check(value)
+    value > @options[:fails_at]
+    false
+  end
+end
 
 # Watch with 
 # watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
@@ -61,7 +71,7 @@ Bluepill.application(:sample_app) do |app|
     end
   end
   
-  1.times do |i|
+  2.times do |i|
     app.process("group_process_#{i}") do |process|
       process.uid = "arya"
       process.gid = "wheel"
@@ -71,11 +81,14 @@ 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 20"
+      process.stop_command = "kill {{PID}}"
       process.daemonize = true
       process.pid_file = "/tmp/p_#{process.group}_#{i}.pid"
       
-      # process.checks :always_true, :every => 5
+      process.checks :random_watch, :every => 2, :fails_at => 0.5
+      process.checks :flapping, :times => 2, :within => 900.seconds, :retry_in => 7.seconds
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -08:00
+date: 2009-12-27 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - lib/bluepill/process_conditions/cpu_usage.rb
 - lib/bluepill/process_conditions/mem_usage.rb
 - lib/bluepill/process_conditions/process_condition.rb
+- lib/bluepill/process_statistics.rb
 - lib/bluepill/socket.rb
 - lib/bluepill/system.rb
 - lib/bluepill/trigger.rb