evented_bluepill 0.0.47 → 0.0.50

data/lib/{bluepill → evented_bluepill}/socket.rb

@@ -1,10 +1,11 @@
 # -*- encoding: utf-8 -*-
 
 require 'socket'
+require 'timeout'
 
 require 'coolio'
 
-module Bluepill
+module EventedBluepill
   module Socket
     class CmdListenerConnection < Coolio::UNIXSocket
       def initialize(socket, application)

data/lib/{bluepill → evented_bluepill}/system.rb

@@ -2,9 +2,10 @@
 
 require 'etc'
 require 'shellwords'
+require 'daemons'
 
-module Bluepill
-  # This class represents the system that bluepill is running on.. It's mainly used to memoize
+module EventedBluepill
+  # This class represents the system that evented_bluepill is running on.. It's mainly used to memoize
   # results of running ps auxx etc so that every watch in the every process will not result in a fork
   module System
     APPEND_MODE = "a"
@@ -169,26 +170,8 @@ module Bluepill
       end
     end
 
-    def ps_axu
-      return @store if @valid_until and @valid_until >= Time.now
-      @valid_until = Time.now + SECONDS_VALID
-
-      @store = begin
-        # BSD style ps invocation
-        lines = `ps axo pid=,ppid=,pcpu=,rss=`.split("\n")
-
-        lines.inject(Hash.new) do |mem, line|
-          chunks = line.split(/\s+/)
-          chunks.delete_if {|c| c.strip.empty? }
-          pid = chunks[IDX_MAP[:pid]].strip.to_i
-          mem[pid] = chunks
-          mem
-        end
-      end
-    end
-
     # be sure to call this from a fork otherwise it will modify the attributes
-    # of the bluepill daemon
+    # of the evented_bluepill daemon
     def drop_privileges(uid, gid)
       if ::Process::Sys.geteuid == 0
         uid_num = Etc.getpwnam(uid).uid if uid
@@ -223,5 +206,25 @@ module Bluepill
         $stderr.reopen(io_err, APPEND_MODE) if io_err
       end
     end
+
+    private
+
+    def ps_axu
+      return @store if @valid_until and @valid_until >= Time.now
+      @valid_until = Time.now + SECONDS_VALID
+
+      @store = begin
+        # BSD style ps invocation
+        lines = `ps axo pid,ppid,pcpu,rss`.split("\n")
+
+        lines.inject(Hash.new) do |mem, line|
+          chunks = line.split(/\s+/)
+          chunks.delete_if {|c| c.strip.empty? }
+          pid = chunks[IDX_MAP[:pid]].strip.to_i
+          mem[pid] = chunks
+          mem
+        end
+      end
+    end
   end
 end

data/lib/{bluepill → evented_bluepill}/trigger.rb

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
-require 'active_support'
+require 'active_support/core_ext/string/inflections'
 
-module Bluepill
+module EventedBluepill
   class TriggerTimer < Coolio::TimerWatcher
     def initialize(trigger, event, delay)
       @trigger = trigger
@@ -57,10 +57,10 @@ module Bluepill
     end
 
     def schedule_event(event, delay)
-      timer = Bluepill::TriggerTimer.new(self, event, delay)
+      timer = EventedBluepill::TriggerTimer.new(self, event, delay)
       self.scheduled_events << timer
       
-      Bluepill::Event.attach(timer)
+      EventedBluepill::Event.attach(timer)
     end
 
     def cancel_all_events

data/lib/{bluepill → evented_bluepill}/triggers/flapping.rb

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 
-module Bluepill
+module EventedBluepill
   module Triggers
-    class Flapping < Bluepill::Trigger
+    class Flapping < EventedBluepill::Trigger
       TRIGGER_STATES = [:starting, :restarting]
-
       PARAMS = [:times, :within, :retry_in]
 
       attr_accessor *PARAMS
@@ -34,19 +33,15 @@ module Bluepill
       end
 
       def check_flapping
-        num_occurances = (@timeline.nitems == self.times)
-
         # The process has not flapped if we haven't encountered enough incidents
-        return unless num_occurances
+        return unless (@timeline.compact.length == self.times)
 
         # Check if the incident happend within the timeframe
         duration = (@timeline.last - @timeline.first) <= self.within
 
         if duration
           self.logger.info "Flapping detected: retrying in #{self.retry_in} seconds"
-
           self.schedule_event(:start, self.retry_in)
-
           self.dispatch!(:unmonitor)
 
           @timeline.clear

data/lib/evented_bluepill/util/rotational_array.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+module EventedBluepill
+  module Util
+    class RotationalArray < Array
+      def initialize(size)
+        @capacity = size
+
+        super() # no size - intentionally
+      end
+
+      def push(value)
+        super(value)
+
+        self.shift if self.length > @capacity
+        self
+      end
+      alias_method :<<, :push
+    end
+  end
+end

data/lib/evented_bluepill/version.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+
+module EventedBluepill
+  module VERSION #:nodoc:
+      MAJOR = 0
+      MINOR = 0
+      TINY  = 50
+      PRE   = nil
+
+      STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+    end
+end

data/lib/evented_bluepill.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+require 'evented_bluepill/event'
+require 'evented_bluepill/application'
+require 'evented_bluepill/controller'
+require 'evented_bluepill/socket'
+require 'evented_bluepill/process'
+require 'evented_bluepill/process_statistics'
+require 'evented_bluepill/group'
+require 'evented_bluepill/logger'
+require 'evented_bluepill/trigger'
+require 'evented_bluepill/triggers/flapping'
+require 'evented_bluepill/dsl/process_factory'
+require 'evented_bluepill/dsl/process_proxy'
+require 'evented_bluepill/dsl/app_proxy'
+require 'evented_bluepill/dsl'
+require 'evented_bluepill/system'
+
+require 'evented_bluepill/process_conditions'
+require 'evented_bluepill/util/rotational_array'
+
+require 'evented_bluepill/version'

data/spec/always_true_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe EventedBluepill::ProcessConditions::AlwaysTrue do
+  before do
+    @condition = EventedBluepill::ProcessConditions::AlwaysTrue.new 'name', stub(:actual_pid => 0)
+  end
+
+  describe "#run" do
+    it "must return 1" do
+      @condition.run.must_equal 1
+    end
+  end
+
+  describe "#check" do
+    it "must return true" do
+      @condition.check(0).must_equal true
+    end
+  end
+end

data/spec/cpu_usage_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe EventedBluepill::ProcessConditions::CpuUsage do
+  before do
+    @condition = EventedBluepill::ProcessConditions::CpuUsage.new 'name', stub(:actual_pid => 0), :below => 2
+  end
+
+  describe "#run" do
+    it "must return current cpu usage" do
+      EventedBluepill::System.expects(:cpu_usage).with(0).returns(1.1)
+      @condition.run.must_equal 1.1
+    end
+  end
+
+  describe "#check" do
+    it "must be true if value is below threshold" do
+      @condition.check(0).must_equal true
+    end
+
+    it "must be false if value is above threshold" do
+      @condition.check(4).must_equal false
+    end
+
+    it "must be false if value is threshold" do
+      @condition.check(2).must_equal false
+    end
+  end
+end

data/spec/mem_usage_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe EventedBluepill::ProcessConditions::MemUsage do
+  before do
+    @condition = EventedBluepill::ProcessConditions::MemUsage.new 'name', stub(:actual_pid => 0), :below => 2048
+  end
+
+  describe "#run" do
+    it "must return current memory usage in kilobytes" do
+      EventedBluepill::System.expects(:memory_usage).with(0).returns(3)
+      @condition.run.must_equal 3072
+    end
+  end
+
+  describe "#check" do
+    it "must be true if value is below threshold" do
+      @condition.check(0).must_equal true
+    end
+
+    it "must be false if value is above threshold" do
+      @condition.check(4096).must_equal false
+    end
+
+    it "must be false if value is threshold" do
+      @condition.check(2048).must_equal false
+    end
+  end
+
+  describe "#format_value" do
+    it "must return value as kilobyte if below one megabyte" do
+      @condition.format_value(768 * 1024).must_equal '768.0KB'
+    end
+
+    it "must return value as megabyte if above one megabyte" do
+      @condition.format_value(2048 * 1024).must_equal '2.0MB'
+    end
+
+    it "must round value" do
+      @condition.format_value(2800 * 1024).must_equal '2.7MB'
+    end
+
+    it "must return value as megabyte if value is one megabyte" do
+      @condition.format_value(1024 * 1024).must_equal '1.0MB'
+    end
+  end
+end

data/spec/process_condition_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe EventedBluepill::ProcessConditions::ProcessCondition do
+  before do
+    @condition = EventedBluepill::ProcessConditions::ProcessCondition.new 'name', stub(:actual_pid => 0)
+  end
+
+  describe "#run" do
+    it "must raise" do
+      assert_raises RuntimeError do
+        @condition.run
+      end
+    end
+  end
+
+  describe "#check" do
+    it "must raise" do
+      assert_raises RuntimeError do
+        @condition.check 0
+      end
+    end
+  end
+
+  describe "#format_value" do
+    it "must return the argument" do
+      value = [1, 2, 3]
+      @condition.format_value(value).must_equal value
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'minitest/autorun'
+require 'mocha'
+
+require 'evented_bluepill'

data/spec/system_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe EventedBluepill::System do
+  describe "#pid_alive?" do
+    it "must return true if pid is alive" do
+      ::Process.expects(:kill).with(0, 12345)
+      EventedBluepill::System.pid_alive?(12345).must_equal true
+    end
+    
+    it "must return false if pid is not alive" do
+      ::Process.expects(:kill).with(0, 12345).raises(Errno::ESRCH, 'ignore')
+      EventedBluepill::System.pid_alive?(12345).must_equal false
+    end
+  end
+end

metadata

@@ -1,14 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: evented_bluepill
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 47
-  version: 0.0.47
+version: !ruby/object:Gem::Version
+  version: 0.0.50
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stefan Huber
 - Arya Asemanfar
 - Gary Tsang
@@ -16,166 +12,185 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-10 00:00:00 +00:00
+date: 2011-03-05 00:00:00.000000000 +00:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154043060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: blankslate
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154043060
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  requirement: &2154042560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.1.2.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: state_machine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154042560
+- !ruby/object:Gem::Dependency
+  name: state_machine
+  requirement: &2154042100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 1
-        version: 0.8.1
+      - !ruby/object:Gem::Version
+        version: 0.9.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2154042100
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: &2154041640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154041640
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2154041180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 10
-        version: 2.3.10
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cool.io
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154041180
+- !ruby/object:Gem::Dependency
+  name: cool.io
+  requirement: &2154040720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id005
-description: 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.
-email: 
+  prerelease: false
+  version_requirements: *2154040720
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2154040260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: *2154040260
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2154039800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: *2154039800
+description: EventedBluepill 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.
+email:
 - MSNexploder@gmail.com
-executables: 
+executables:
 - bluepill
-- sample_forking_server
+- evented_bluepill
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- CHANGELOG.md
 - DESIGN.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/bluepill
-- bin/sample_forking_server
+- bin/evented_bluepill
 - evented_bluepill.gemspec
+- example/example.rb
+- example/runit_example.rb
+- example/sample_forking_server
 - 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/dsl/app_proxy.rb
-- lib/bluepill/dsl/process_factory.rb
-- lib/bluepill/dsl/process_proxy.rb
-- lib/bluepill/event.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
+- lib/evented_bluepill.rb
+- lib/evented_bluepill/application.rb
+- lib/evented_bluepill/application/client.rb
+- lib/evented_bluepill/application/server.rb
+- lib/evented_bluepill/controller.rb
+- lib/evented_bluepill/dsl.rb
+- lib/evented_bluepill/dsl/app_proxy.rb
+- lib/evented_bluepill/dsl/process_factory.rb
+- lib/evented_bluepill/dsl/process_proxy.rb
+- lib/evented_bluepill/event.rb
+- lib/evented_bluepill/group.rb
+- lib/evented_bluepill/logger.rb
+- lib/evented_bluepill/options.rb
+- lib/evented_bluepill/process.rb
+- lib/evented_bluepill/process_conditions.rb
+- lib/evented_bluepill/process_conditions/always_true.rb
+- lib/evented_bluepill/process_conditions/cpu_usage.rb
+- lib/evented_bluepill/process_conditions/http.rb
+- lib/evented_bluepill/process_conditions/mem_usage.rb
+- lib/evented_bluepill/process_conditions/process_condition.rb
+- lib/evented_bluepill/process_statistics.rb
+- lib/evented_bluepill/socket.rb
+- lib/evented_bluepill/system.rb
+- lib/evented_bluepill/trigger.rb
+- lib/evented_bluepill/triggers/flapping.rb
+- lib/evented_bluepill/util/rotational_array.rb
+- lib/evented_bluepill/version.rb
+- spec/always_true_spec.rb
+- spec/cpu_usage_spec.rb
+- spec/mem_usage_spec.rb
+- spec/process_condition_spec.rb
+- spec/spec_helper.rb
+- spec/system_spec.rb
 has_rdoc: true
 homepage: http://github.com/msnexploder/evented_bluepill
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: evented_bluepill
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A process monitor written in Ruby with stability and minimalism in mind.
-test_files: []
-
+test_files:
+- spec/always_true_spec.rb
+- spec/cpu_usage_spec.rb
+- spec/mem_usage_spec.rb
+- spec/process_condition_spec.rb
+- spec/spec_helper.rb
+- spec/system_spec.rb