bluepill 0.0.46 → 0.0.47

data/.gitignore

@@ -2,4 +2,7 @@
 .DS_Store
 coverage
 rdoc
-pkg
+pkg/*
+*.gem
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+# Specify your gem's dependencies in bluepill.gemspec
+gemspec

data/README.md

@@ -2,7 +2,7 @@
 Bluepill is a simple process monitoring tool written in Ruby. 
 
 ## Installation
-It's hosted on [gemcutter.org][gemcutter].
+It's hosted on [rubygems.org][rubygems].
 
     sudo gem install bluepill
     
@@ -224,5 +224,5 @@ Bugs/Features: [http://github.com/arya/bluepill/issues](http://github.com/arya/b
 Mailing List: [http://groups.google.com/group/bluepill-rb](http://groups.google.com/group/bluepill-rb)
 
 
-[gemcutter]: http://gemcutter.org
+[rubygems]: http://rubygems.org/gems/bluepill
     

data/Rakefile

@@ -1,57 +1,4 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "bluepill"
-    gem.summary = %Q{A process monitor written in Ruby with stability and minimalism in mind.}
-    gem.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.}
-    gem.email = "entombedvirus@gmail.com"
-    gem.homepage = "http://github.com/arya/bluepill"
-    gem.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency("i18n", ">= 0.5.0")
-    gem.add_dependency("daemons", ">= 1.0.9")
-    gem.add_dependency("blankslate", ">= 2.1.2.2")
-    gem.add_dependency("state_machine", ">= 0.8.0", "<=0.9.4")
-    gem.add_dependency("activesupport", ">= 2.3.4")
-
-    gem.files -= ["bin/sample_forking_server"]
-    gem.executables = ["bluepill"]
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "blue-pill #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-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|
-      file.write <<-END
-module Bluepill
-  VERSION = "#{version}"
-end
-      END
-    end
-  end
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/bin/bluepill

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
 require 'optparse'
 require 'bluepill'
 

data/bin/sample_forking_server

@@ -0,0 +1,53 @@
+#! /usr/bin/env ruby
+
+# This is a modified version found at http://tomayko.com/writings/unicorn-is-unix
+# It is modified to trigger various states like increase memory consumption so that 
+# I could write watches for them.
+
+# Instructions for running the test
+# 
+# (1) Edit the example config and fix the path to this file. Around line 16.
+# (2) Load up the config and run the bluepill daemon
+# (3) Run watch -n0.2 'sudo ruby bin/bluepill status 2>/dev/null; echo; ps ajxu | egrep "(CPU|forking|bluepill|sleep|ruby)" | grep -v grep | sort'
+# (4) After verifying that the "sleep" workers are properly being restarted, telnet to localhost 4242 and say something. You should get it echoed back and the worker which answered your request should now be over the allowed memory limit
+# (5) Observe the worker being killed in the watch you started in step 3.
+
+require 'socket'
+
+port = ARGV[0].to_i
+port = 4242 if port == 0
+
+acceptor = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+address = Socket.pack_sockaddr_in(port, '127.0.0.1')
+acceptor.bind(address)
+acceptor.listen(10)
+
+children = []
+trap('EXIT') { acceptor.close; children.each {|c| Process.kill('QUIT', c)} }
+
+
+3.times do
+  children << fork do
+    trap('QUIT') {$0 = "forking_server| QUIT received shutting down gracefully..."; sleep 5; exit}
+    trap('INT') {$0 = "forking_server| INT received shutting down UN-gracefully..."; sleep 3; exit}
+    
+    puts "child #$$ accepting on shared socket (localhost:#{port})"
+    loop {
+      socket, addr = acceptor.accept
+      socket.write "child #$$ echo> "
+      socket.flush
+      message = socket.gets
+      socket.write message
+      socket.close
+      puts "child #$$ echo'd: '#{message.strip}'"
+      
+      # cause a spike in mem usage
+      temp = "*" * (100 * 1024)
+    }
+    exit
+  end
+end
+
+trap('INT') { puts "\nbailing" ; exit }
+
+Process.waitall

data/bluepill.gemspec

@@ -1,88 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{bluepill}
-  s.version = "0.0.46"
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+require "bluepill/version"
 
-  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{2011-03-25}
-  s.default_executable = %q{bluepill}
+Gem::Specification.new do |s|
+  s.name        = "bluepill"
+  s.version     = Bluepill::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
+  s.email       = ["entombedvirus@gmail.com"]
+  s.homepage    = "http://github.com/arya/bluepill"
+  s.summary     = %q{A process monitor written in Ruby with stability and minimalism in mind.}
   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.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "DESIGN.md",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/bluepill",
-     "bin/bpsv",
-     "bluepill.gemspec",
-     "lib/bluepill.rb",
-     "lib/bluepill/application.rb",
-     "lib/bluepill/application/client.rb",
-     "lib/bluepill/application/server.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/http.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",
-     "lib/bluepill/triggers/flapping.rb",
-     "lib/bluepill/util/rotational_array.rb",
-     "lib/bluepill/version.rb",
-     "lib/example.rb",
-     "lib/runit_example.rb"
-  ]
-  s.homepage = %q{http://github.com/arya/bluepill}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A process monitor written in Ruby with stability and minimalism in mind.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency 'daemons', '~> 1.1.0'
+  s.add_dependency 'blankslate', '~> 2.1.2.3'
+  s.add_dependency 'state_machine', ['~> 0.8.0', '<=0.9.4']
+  s.add_dependency 'activesupport', '~> 2.3.4'
+  s.add_dependency 'i18n', '~> 0.5.0'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 1.0.9"])
-      s.add_runtime_dependency(%q<blankslate>, [">= 2.1.2.2"])
-      s.add_runtime_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-    else
-      s.add_dependency(%q<i18n>, [">= 0.5.0"])
-      s.add_dependency(%q<daemons>, [">= 1.0.9"])
-      s.add_dependency(%q<blankslate>, [">= 2.1.2.2"])
-      s.add_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    end
-  else
-    s.add_dependency(%q<i18n>, [">= 0.5.0"])
-    s.add_dependency(%q<daemons>, [">= 1.0.9"])
-    s.add_dependency(%q<blankslate>, [">= 2.1.2.2"])
-    s.add_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-  end
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ["lib"]
+  s.extra_rdoc_files = ["LICENSE", "README.md"]
 end
-

data/{lib → examples}/example.rb

@@ -4,78 +4,78 @@ require 'logger'
 
 ROOT_DIR = "/tmp/bp"
 
-# Watch with 
+# Watch with
 # watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
 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"
-      
+
       # I could not figure out a portable way to
       # specify the path to the sample forking server across the diff developer laptops.
       # Since this code is eval'ed we cannot reliably use __FILE__
       process.start_command = "/Users/rohith/work/bluepill/bin/sample_forking_server #{4242 + i}"
       process.stop_command = "kill -INT {{PID}}"
       process.daemonize = true
-      
+
       process.start_grace_time = 1.seconds
       process.restart_grace_time = 7.seconds
       process.stop_grace_time = 7.seconds
-      
+
       process.uid = "rohith"
       process.gid = "staff"
-      
+
       # 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.monitor_children do |child_process|
-        # child_process.checks :cpu_usage, 
-        #   :every => 10, 
-        #   :below => 0.5, 
+        # child_process.checks :cpu_usage,
+        #   :every => 10,
+        #   :below => 0.5,
         #   :times => [5, 5]
-        
-        # child_process.checks :mem_usage, 
-        #   :every => 3, 
-        #   :below => 600.kilobytes, 
-        #   :times => [3, 5], 
+
+        # child_process.checks :mem_usage,
+        #   :every => 3,
+        #   :below => 600.kilobytes,
+        #   :times => [3, 5],
         #   :fires => [:stop]
-        
+
         child_process.stop_command = "kill -QUIT {{PID}}"
         # child_process.checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
       end
     end
   end
-  
+
   0.times do |i|
     app.process("group_process_#{i}") do |process|
       process.group = "group_1"
       process.pid_file = "/Users/rohith/ffs/tmp/pids/mongrel_#{i}.pid"
       process.start_command = "cd ~/ffs && mongrel_rails start -P #{process.pid_file} -p 3000 -d"
-      
+
       process.start_grace_time = 10.seconds
-      
+
       process.uid = "rohith"
       process.gid = "staff"
-      
+
       # process.checks :always_true, :every => 10
     end
   end
-  
+
   1.times do |i|
     app.process("group_process_#{i}") do |process|
       process.uid = "rohith"
       process.gid = "wheel"
 
-      process.stderr = "/tmp/err.log"      
+      process.stderr = "/tmp/err.log"
       process.stdout = "/tmp/err.log"
 
-      
+
       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/noperm/p_#{process.group}_#{i}.pid"
-      
+
       # process.checks :always_true, :every => 5
     end
   end
-end
+end

data/{lib → examples}/runit_example.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'rubygems'
 require 'bluepill'
 require 'logger'
@@ -5,16 +6,16 @@ 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.
+# http://github.com/Undev/runit-man used as example of monitored application.
 
 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   = "/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.restart_grace_time = 7.seconds
     process.stop_grace_time    = 7.seconds

data/lib/bluepill.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'rubygems'
 
 require 'thread'
@@ -11,6 +12,10 @@ require 'active_support/core_ext/hash'
 require 'active_support/core_ext/numeric'
 require 'active_support/duration'
 
+require 'bluepill/dsl/process_proxy'
+require 'bluepill/dsl/process_factory'
+require 'bluepill/dsl/app_proxy'
+
 require 'bluepill/application'
 require 'bluepill/controller'
 require 'bluepill/socket'
@@ -28,4 +33,4 @@ require "bluepill/process_conditions"
 
 require "bluepill/util/rotational_array"
 
-require "bluepill/version"
+require "bluepill/version"

data/lib/bluepill/application.rb

@@ -1,9 +1,10 @@
+# -*- encoding: utf-8 -*-
 require 'thread'
 
 module Bluepill
   class Application
     PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor, :status]
-    
+
     attr_accessor :name, :logger, :base_dir, :socket, :pid_file
     attr_accessor :groups, :work_queue
     attr_accessor :pids_dir, :log_file
@@ -12,18 +13,18 @@ module Bluepill
       self.name = name
 
       @foreground   = options[:foreground]
-      self.log_file = options[:log_file]      
+      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")
       self.pids_dir = File.join(self.base_dir, 'pids', self.name)
 
       self.groups = {}
-      
+
       self.logger = Bluepill::Logger.new(:log_file => self.log_file, :stdout => foreground?).prefix_with(self.name)
-      
+
       self.setup_signal_traps
       self.setup_pids_dir
-      
+
       @mutex = Mutex.new
     end
 
@@ -45,7 +46,7 @@ module Bluepill
         exit(5)
       end
     end
-    
+
     PROCESS_COMMANDS.each do |command|
       class_eval <<-END
         def #{command}(group_name = nil, process_name = nil)
@@ -53,14 +54,14 @@ module Bluepill
         end
       END
     end
-    
+
     def add_process(process, group_name = nil)
       group_name = group_name.to_s if group_name
-      
+
       self.groups[group_name] ||= Group.new(group_name, :logger => self.logger.prefix_with(group_name))
       self.groups[group_name].add_process(process)
     end
-    
+
     def version
       Bluepill::VERSION
     end
@@ -110,26 +111,26 @@ module Bluepill
         end
       end
     end
-    
+
     def start_server
       self.kill_previous_bluepill
-      
+
       Daemonize.daemonize unless foreground?
-      
+
       self.logger.reopen
-      
+
       $0 = "bluepilld: #{self.name}"
-      
+
       self.groups.each {|_, group| group.determine_initial_state }
 
-      
+
       self.write_pid_file
       self.socket = Bluepill::Socket.server(self.base_dir, self.name)
       self.start_listener
-      
+
       self.run
     end
-    
+
     def run
       @running = true # set to false by signal trap
       while @running
@@ -141,33 +142,33 @@ module Bluepill
       end
       cleanup
     end
-    
+
     def cleanup
       File.unlink(self.socket.path) if self.socket
       File.unlink(self.pid_file) if File.exists?(self.pid_file)
     end
-    
+
     def setup_signal_traps
       terminator = Proc.new do
         puts "Terminating..."
         @running = false
       end
-      
-      Signal.trap("TERM", &terminator) 
-      Signal.trap("INT", &terminator) 
-      
+
+      Signal.trap("TERM", &terminator)
+      Signal.trap("INT", &terminator)
+
       Signal.trap("HUP") do
         self.logger.reopen if self.logger
       end
     end
-    
+
     def setup_pids_dir
       FileUtils.mkdir_p(self.pids_dir) unless File.exists?(self.pids_dir)
       # we need everybody to be able to write to the pids_dir as processes managed by
       # bluepill will be writing to this dir after they've dropped privileges
       FileUtils.chmod(0777, self.pids_dir)
     end
-    
+
     def kill_previous_bluepill
       if File.exists?(self.pid_file)
         previous_pid = File.read(self.pid_file).to_i
@@ -194,7 +195,7 @@ module Bluepill
         end
       end
     end
-    
+
     def write_pid_file
       File.open(self.pid_file, 'w') { |x| x.write(::Process.pid) }
     end