bluepill 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/bluepill

@@ -5,7 +5,6 @@ require 'bluepill'
 
 # defaults
 options = {
-  :application => "all",
   :log_file => "/var/log/bluepill.log"
 }
 
@@ -37,6 +36,7 @@ case options[:command]
 when "load"
   file = ARGV.shift
   eval(File.read(file))
+  
 when "log"
   pattern = ARGV.shift
   pattern = controller.send_cmd(options[:application], :grep_pattern, pattern)
@@ -49,5 +49,5 @@ when *ALLOWED_COMMANDS
   puts controller.send_cmd(options[:application], options[:command], process_or_group_name)
 
 else
-  "Unknown command `%s`" % options[:command]
+  puts "Unknown command `%s`" % options[:command]
 end

data/bluepill.gemspec

@@ -0,0 +1,88 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{bluepill}
+  s.version = "0.0.2"
+
+  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-10-05}
+  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}
+  s.executables = ["bluepill"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/bluepill",
+     "bluepill.gemspec",
+     "lib/bluepill.rb",
+     "lib/bluepill/application.rb",
+     "lib/bluepill/application/client.rb",
+     "lib/bluepill/application/server.rb",
+     "lib/bluepill/comm.rb",
+     "lib/bluepill/condition_watch.rb",
+     "lib/bluepill/controller.rb",
+     "lib/bluepill/dsl.rb",
+     "lib/bluepill/group.rb",
+     "lib/bluepill/logger.rb",
+     "lib/bluepill/process.rb",
+     "lib/bluepill/process_conditions.rb",
+     "lib/bluepill/process_conditions/always_true.rb",
+     "lib/bluepill/process_conditions/cpu_usage.rb",
+     "lib/bluepill/process_conditions/mem_usage.rb",
+     "lib/bluepill/process_conditions/process_condition.rb",
+     "lib/bluepill/socket.rb",
+     "lib/bluepill/util/rotational_array.rb",
+     "lib/example.rb",
+     "spec/blue-pill_spec.rb",
+     "spec/process_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/arya/bluepill}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{A process monitor written in Ruby with stability and minimalism in mind.}
+  s.test_files = [
+    "spec/blue-pill_spec.rb",
+     "spec/process_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 1.0.9"])
+      s.add_runtime_dependency(%q<pluginaweek-state_machine>, [">= 0.8.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 1.0.9"])
+      s.add_dependency(%q<pluginaweek-state_machine>, [">= 0.8.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 1.0.9"])
+    s.add_dependency(%q<pluginaweek-state_machine>, [">= 0.8.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+  end
+end

data/lib/bluepill/application.rb

@@ -1,18 +1,14 @@
-require 'logger'
-
 module Bluepill
   class Application
     attr_accessor :name, :logger, :base_dir, :socket, :pid_file
-    attr_accessor :groups, :group_logger
+    attr_accessor :groups
     
     def initialize(name, options = {})
       self.name = name
       self.base_dir = options[:base_dir] ||= '/var/bluepill'
       
-      self.logger = Bluepill::Logger.new
-      self.group_logger = Bluepill::Logger.new(self.logger, "#{self.name}:") if self.logger
+      self.logger = Bluepill::Logger.new.prefix_with(self.name)
       
-      # self.groups = Hash.new { |h,k| h[k] = Group.new(k, :logger => self.group_logger) }
       self.groups = Hash.new 
 
       self.pid_file = File.join(self.base_dir, 'pids', self.name + ".pid")
@@ -118,9 +114,17 @@ module Bluepill
       end
     end
     
-    def add_process(process, group = nil)
-      self.groups[group] ||= Group.new(group, :logger => self.group_logger)
-      self.groups[group].add_process(process)
+    def quit
+      if @server
+        ::Process.kill("TERM", 0)
+      else
+        send_to_server("quit")
+      end
+    end
+    
+    def add_process(process, group_name = nil)
+      self.groups[group_name] ||= Group.new(group_name, :logger => self.logger.prefix_with(group_name))
+      self.groups[group_name].add_process(process)
     end
     
     def send_to_server(method)
@@ -204,10 +208,10 @@ private
       Signal.trap("INT", &terminator) 
     end
    
-    def grep_pattern(query)
-      bluepilld = 'bluepill\[[[:digit:]]+\]:[[:space:]]+'
-      pattern = [self.name, query].join('|')
-      [bluepilld, '\[.*', Regexp.escape(pattern), '.*\]'].join
+    def grep_pattern(query = nil)
+      bluepilld = 'bluepilld\[[[:digit:]]+\]:[[:space:]]+'
+      pattern = [self.name, query].compact.join(':')
+      [bluepilld, '\[.*', Regexp.escape(pattern), '.*'].join
     end
   end
 end

data/lib/bluepill/condition_watch.rb

@@ -1,6 +1,6 @@
 module Bluepill
   class ConditionWatch
-    attr_accessor :logger
+    attr_accessor :logger, :name
     def initialize(name, options = {})
       @name = name
 
@@ -26,9 +26,9 @@ module Bluepill
     
     def record_value(value)
       # TODO: record value in ProcessStatistics
-      self.logger.info(self.to_s) if self.logger
       @history[@history_index] = [value, @process_condition.check(value)]
       @history_index = (@history_index + 1) % @history.size
+      self.logger.info(self.to_s)
     end
     
     def clear_history!
@@ -38,7 +38,7 @@ module Bluepill
     end
     
     def fired?
-      @history.select {|v| !v[1] }.size >= @times[0]
+      @history.select {|v| v && !v[1]}.size >= @times[0]
     end
     
     def to_s
@@ -46,7 +46,8 @@ 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
-      @history.collect {|v| "#{v[0]}#{v[1] ? '' : '*'}"}.join(", ")
+      data = @history.collect {|v| "#{v[0]}#{v[1] ? '' : '*'}" if v}.compact.join(", ")
+      "#{@name}: [#{data}]"
     end
   end
 end

data/lib/bluepill/controller.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Bluepill
   class Controller
     attr_accessor :base_dir, :sockets_dir, :pids_dir
@@ -8,6 +10,7 @@ module Bluepill
       self.sockets_dir = File.join(base_dir, 'socks')
       self.pids_dir = File.join(base_dir, 'pids')
       self.applications = Hash.new 
+      setup_dir_structure
     end
     
     def list
@@ -18,5 +21,13 @@ module Bluepill
       applications[application] ||= Application.new(application, {:base_dir => base_dir})
       applications[application].send(command.to_sym, *args.compact)
     end
+    
+    private
+    
+    def setup_dir_structure
+      [@sockets_dir, @pids_dir].each do |dir|
+        FileUtils.mkdir_p(dir) unless File.exists?(dir)
+      end
+    end
   end
 end

data/lib/bluepill/group.rb

@@ -7,15 +7,10 @@ module Bluepill
       self.name = name
       self.processes = []
       self.logger = options[:logger]
-      
-      if self.logger
-        logger_prefix = self.name ? "#{self.name}:" : nil
-        self.process_logger = Bluepill::Logger.new(self.logger, logger_prefix) 
-      end
     end
     
     def add_process(process)
-      process.logger = Logger.new(self.process_logger, process.name)
+      process.logger = self.logger.prefix_with(process.name)
       self.processes << process
     end
     

data/lib/bluepill/logger.rb

@@ -1,17 +1,29 @@
 module Bluepill
   class Logger
-    def initialize(logger = nil, prefix = nil)
-      @logger = logger || Syslog.open('bluepill', Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL6)
-      @prefix = prefix
+    LOG_METHODS = [:emerg, :alert, :crit, :err, :warning, :notice, :info, :debug]
+    
+    def initialize(options = {})
+      @logger = options[:logger] || Syslog.open(options[:identity] || 'bluepilld', Syslog::LOG_PID, Syslog::LOG_LOCAL6)
+      @prefix = options[:prefix]
+      @prefixes = {}
     end
     
-    [:emerg, :alert, :crit, :err, :warning, :notice, :info, :debug].each do |method|
+    LOG_METHODS.each do |method|
       eval <<-END
-        def #{method}(*args)
-          with_prefix = args.collect {|s| "\#{@prefix}\#{s}" }
-          @logger.#{method}(*with_prefix)
+        def #{method}(msg, prefix = [])
+          if @logger.is_a?(self.class)
+            @logger.#{method}(msg, [@prefix] + prefix)
+          else
+            prefix = prefix.size > 0 ? "[\#{prefix.compact.join(':')}] " : ""
+            @logger.#{method}("\#{prefix}\#{msg}")
+          end
         end
       END
     end
+    
+    def prefix_with(prefix)
+      @prefixes[prefix] ||= self.class.new(:logger => self, :prefix => prefix)
+    end
+    
   end
 end

data/lib/bluepill/process.rb

@@ -82,7 +82,7 @@ module Bluepill
     end
     
     def add_watch(name, options = {})
-      self.watches << ConditionWatch.new(name, options.merge(:logger => self.watch_logger))
+      self.watches << ConditionWatch.new(name, options.merge(:logger => self.logger))
     end
     
     def daemonize?
@@ -90,10 +90,14 @@ module Bluepill
     end
     
     def dispatch!(event)
-      logger.info "Got stop"
       self.send("#{event}!")
     end
     
+    def logger=(logger)
+      @logger = logger
+      self.watches.each {|w| w.logger = logger }
+    end
+    
     def process_running?(force = false)
       @process_running = nil if force
       @process_running ||= signal_process(0)
@@ -158,14 +162,18 @@ module Bluepill
       now = Time.now.to_i
 
       threads = self.watches.collect do |watch|
-        Thread.new { Thread.current[:events] = watch.run(self.actual_pid, now) }
+        [watch, Thread.new { Thread.current[:events] = watch.run(self.actual_pid, now) }]
       end
       
       @transitioned = false
       
-      threads.inject([]) do |events, thread|
+      threads.inject([]) do |events, (watch, thread)|
         thread.join
-        events << thread[:events]
+        if thread[:events].size > 0
+          logger.info "#{watch.name} dispatched: #{thread[:events].join(',')}"
+          events << thread[:events]
+        end
+        events
       end.flatten.uniq.each do |event|
         break if @transitioned
         self.dispatch!(event)
@@ -174,6 +182,7 @@ module Bluepill
     
     def record_transition(state_name)
       @transitioned = true
+      self.watches.each { |w| w.clear_history! }
       # do other stuff here?
     end
     
@@ -192,10 +201,6 @@ module Bluepill
       @actual_pid = nil
       File.unlink(pid_file) if File.exists?(pid_file)
     end
-    
-    def watch_logger
-      @watch_logger ||= Logger.new(self.logger, "#{self.name}:") if self.logger
-    end
   end
 end
  

data/lib/example.rb

@@ -19,25 +19,25 @@ ROOT_DIR = "/tmp/bp"
 # application.start
 
 
-Bluepill.application(:sample_app, :base_dir => ROOT_DIR) do |app|
+Bluepill.application(:sample_app) do |app|
   2.times do |i|
     app.process("process_#{i}") do |process|
       process.start_command = "echo 'Process #{i}' && sleep #{rand(15) + i}"
       process.daemonize = true
       process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
       
-      process.checks :always_true, :every => 2
+      process.checks :cpu_usage, :every => 1, :below => 1, :times => [1,4]
     end
   end
   
-  10.times do |i|
+  0.times do |i|
     app.process("group_process_#{i}") do |process|
       process.start_command = "sleep #{rand(15) + i}"
       process.group = "Poopfaced"
       process.daemonize = true
       process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
       
-      process.checks :always_true, :every => 2
+      process.checks :always_true, :every => 10
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -73,6 +73,7 @@ files:
 - Rakefile
 - VERSION
 - bin/bluepill
+- bluepill.gemspec
 - lib/bluepill.rb
 - lib/bluepill/application.rb
 - lib/bluepill/application/client.rb