evented_bluepill 0.0.46 → 0.0.47

data/.gitignore

@@ -0,0 +1,8 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg/*
+*.gem
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in lorem.gemspec
+gemspec

data/Rakefile

@@ -1,54 +1,2 @@
-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("daemons", ">= 1.0.9")
-    gem.add_dependency("blankslate", ">= 2.1.2.2")
-    gem.add_dependency("state_machine", ">= 0.8.0")
-    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,6 +1,5 @@
-#!/usr/bin/env ruby
-$LOAD_PATH << 'lib/'
-
+#! /usr/bin/env ruby
+# -*- encoding: utf-8 -*-
 require 'optparse'
 require 'bluepill'
 

data/bin/sample_forking_server

@@ -0,0 +1,55 @@
+#! /usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
+# 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)} }
+
+File.open('/tmp/bp/pids/process_0.pid', 'w') { |x| x.write(::Process.pid) }
+
+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/evented_bluepill.gemspec

@@ -1,86 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "bluepill/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{evented_bluepill}
-  s.version = "0.0.46"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Stefan Huber", "Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-  s.date = %q{2011-01-10}
-  s.default_executable = %q{bluepill}
+  s.name        = "evented_bluepill"
+  s.version     = Bluepill::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Stefan Huber", "Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
+  s.email       = ["MSNexploder@gmail.com"]
+  s.homepage    = "http://github.com/msnexploder/evented_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{MSNexploder@gmail.com}
-  s.executables = ["bluepill"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "DESIGN.md",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/bluepill",
-    "bin/bpsv",
-    "evented_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/msnexploder/evented_bluepill}
-  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.0.10'
+  s.add_dependency 'blankslate', '~> 2.1.2.3'
+  s.add_dependency 'state_machine', '~> 0.8.1'
+  s.add_dependency 'activesupport', '~> 2.3.10'
+  s.add_dependency 'cool.io', '~> 1.0.0'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<cool.io>, [">= 1.0.0"])
-    else
-      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"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<cool.io>, [">= 1.0.0"])
-    end
-  else
-    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"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<cool.io>, [">= 1.0.0"])
-  end
-end
+  s.rubyforge_project = "evented_bluepill"
 
+  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"]
+end

data/lib/bluepill.rb

@@ -1,16 +1,16 @@
+# -*- encoding: utf-8 -*-
+
 require 'rubygems'
 
-require 'thread'
 require 'monitor'
 require 'syslog'
 require 'timeout'
 require 'logger'
 
-require 'active_support/inflector'
-require 'active_support/core_ext/hash'
 require 'active_support/core_ext/numeric'
-require 'active_support/duration'
+require 'active_support/core_ext/hash'
 
+require 'bluepill/event'
 require 'bluepill/application'
 require 'bluepill/controller'
 require 'bluepill/socket'
@@ -21,6 +21,9 @@ require "bluepill/logger"
 require "bluepill/condition_watch"
 require 'bluepill/trigger'
 require 'bluepill/triggers/flapping'
+require 'bluepill/dsl/process_factory'
+require 'bluepill/dsl/process_proxy'
+require 'bluepill/dsl/app_proxy'
 require "bluepill/dsl"
 require "bluepill/system"
 

data/lib/bluepill/application.rb

@@ -1,10 +1,10 @@
-require 'thread'
+# -*- encoding: utf-8 -*-
 
 module Bluepill
   class Application
     PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor, :status]
-    
-    attr_accessor :name, :logger, :base_dir, :socket, :pid_file
+
+    attr_accessor :name, :logger, :cmd_listener, :base_dir, :pid_file
     attr_accessor :groups, :work_queue
     attr_accessor :pids_dir, :log_file
 
@@ -12,29 +12,23 @@ 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
 
     def foreground?
       !!@foreground
     end
 
-    def mutex(&b)
-      @mutex.synchronize(&b)
-    end
-
     def load
       begin
         self.start_server
@@ -45,7 +39,7 @@ module Bluepill
         exit(5)
       end
     end
-    
+
     PROCESS_COMMANDS.each do |command|
       class_eval <<-END
         def #{command}(group_name = nil, process_name = nil)
@@ -53,19 +47,20 @@ 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
 
     protected
+
     def send_to_process_or_group(method, group_name, process_name)
       if group_name.nil? && process_name.nil?
         self.groups.values.collect do |group|
@@ -84,90 +79,52 @@ module Bluepill
       end
     end
 
-    def start_listener
-      @listener_thread.kill if @listener_thread
-      @listener_thread = Thread.new do
-        loop do
-          begin
-            client = self.socket.accept
-            command, *args = client.readline.strip.split(":")
-            response = begin
-              mutex { self.send(command, *args) }
-            rescue Exception => e
-              e
-            end
-            client.write(Marshal.dump(response))
-          rescue StandardError => e
-            logger.err("Got exception in cmd listener: %s `%s`" % [e.class.name, e.message])
-            e.backtrace.each {|l| logger.err(l)}
-          ensure
-            begin
-              client.close
-            rescue IOError
-              # closed stream
-            end
-          end
-        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
-        mutex do
-          System.reset_data
-          self.groups.each { |_, group| group.tick }
-        end
-        sleep 1
-      end
+      self.cmd_listener = Bluepill::Socket.server(self.base_dir, self.name, self)
+      Bluepill::Event.attach(self.cmd_listener)
+      Bluepill::Event.run
+
       cleanup
     end
-    
+
     def cleanup
-      File.unlink(self.socket.path) if self.socket
+      # TODO ugly
+      File.unlink(Bluepill::Socket.socket_path(self.base_dir, self.name)) if self.cmd_listener
       File.unlink(self.pid_file) if File.exists?(self.pid_file)
     end
-    
+
     def setup_signal_traps
-      terminator = lambda do
+      terminator = Proc.new do
         puts "Terminating..."
-        @running = false
+        Bluepill::Event.stop
       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 +151,7 @@ module Bluepill
         end
       end
     end
-    
+
     def write_pid_file
       File.open(self.pid_file, 'w') { |x| x.write(::Process.pid) }
     end