bluepill 0.0.62 → 0.0.63

data/.gitignore

@@ -8,3 +8,5 @@ pkg/
 .bundle/
 Gemfile.lock
 .idea
+bluepill.log
+

data/Gemfile

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

data/README.md

@@ -72,6 +72,23 @@ To watch memory usage, we just add one more line:
     end
  ```
 
+To watch the modification time of a file, e.g. a log file to ensure the process is actually working add one more line:
+
+```ruby
+    Bluepill.application("app_name") do |app|
+      app.process("process_name") do |process|
+        process.start_command = "/usr/bin/some_start_command"
+        process.pid_file = "/tmp/some_pid_file.pid"
+
+        process.checks :cpu_usage, :every => 10.seconds, :below => 5, :times => 3        
+        process.checks :mem_usage, :every => 10.seconds, :below => 100.megabytes, :times => [3,5]
+        process.checks :file_time, :every => 60.seconds, :below => 3.minutes, :filename => "/tmp/some_file.log", :times => 2
+      end
+    end
+ ```
+
+
+
 We can tell bluepill to give a process some grace time to start/stop/restart before resuming monitoring:
 
 ```ruby

data/bluepill.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '>= 1.0.10'
   s.add_development_dependency 'rake', '!= 0.9.0'
-  s.add_development_dependency 'rspec-core', '~> 2.0'
-  s.add_development_dependency 'rspec-expectations', '~> 2.0'
-  s.add_development_dependency 'rr', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 2.12.0'
   s.add_development_dependency 'faker', '~> 0.9'
   s.add_development_dependency 'yard', '~> 0.7'
 

data/lib/bluepill/application.rb

@@ -16,7 +16,7 @@ module Bluepill
 
       @foreground   = options[:foreground]
       self.log_file = options[:log_file]
-      self.base_dir = options[:base_dir] || '/var/run/bluepill'
+      self.base_dir = ProcessJournal.base_dir = options[:base_dir] || '/var/run/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.kill_timeout = options[:kill_timeout] || 10

data/lib/bluepill/group.rb

@@ -36,9 +36,17 @@ module Bluepill
           self.processes.each do |process|
             next if process_name && process_name != process.name
             affected << [self.name, process.name].join(":")
-            threads << Thread.new { process.handle_user_command("#{event}") }
+            noblock = process.group_#{event}_noblock
+            if noblock
+              self.logger.debug("Command #{event} running in non-blocking mode.")
+              threads << Thread.new { process.handle_user_command("#{event}") }
+            else
+              self.logger.debug("Command #{event} running in blocking mode.")
+              thread = Thread.new { process.handle_user_command("#{event}") }
+              thread.join
+            end
           end
-          threads.each { |t| t.join }
+          threads.each { |t| t.join } unless threads.nil?
           affected
         end
       END
@@ -69,4 +77,4 @@ module Bluepill
     end
 
   end
-end
+end

data/lib/bluepill/process.rb

@@ -42,7 +42,15 @@ module Bluepill
 
       :supplementary_groups,
 
-      :stop_signals
+      :stop_signals,
+
+      :on_start_timeout,
+
+      :group_start_noblock,
+      :group_restart_noblock,
+      :group_stop_noblock,
+      :group_unmonitor_noblock
+
     ]
 
     attr_accessor :name, :watches, :triggers, :logger, :skip_ticks_until, :process_running
@@ -127,6 +135,8 @@ module Bluepill
       @cache_actual_pid = true
       @start_grace_time = @stop_grace_time = @restart_grace_time = 3
       @environment = {}
+      @on_start_timeout = "start"
+      @group_start_noblock = @group_stop_noblock = @group_restart_noblock = @group_unmonitor_noblock = true
 
       CONFIGURABLE_ATTRIBUTES.each do |attribute_name|
         self.send("#{attribute_name}=", options[attribute_name]) if options.has_key?(attribute_name)
@@ -274,14 +284,13 @@ module Bluepill
         if daemon_id > 0
           ProcessJournal.append_pid_to_journal(name, daemon_id)
           children.each {|child|
-            child_pid = child.actual_id
-            ProcessJournal.append_pid_to_journal(name, child_id)
+            ProcessJournal.append_pid_to_journal(name, child.actual_id)
           } if self.monitor_children?
         end
         daemon_id
       else
         # This is a self-daemonizing process
-        with_timeout(start_grace_time) do
+        with_timeout(start_grace_time, on_start_timeout) do
           result = System.execute_blocking(start_command, self.system_command_options)
 
           unless result[:exit_code].zero?
@@ -315,7 +324,7 @@ module Bluepill
         cmd = self.prepare_command(stop_command)
         logger.warning "Executing stop command: #{cmd}"
 
-        with_timeout(stop_grace_time) do
+        with_timeout(stop_grace_time, "stop") do
           result = System.execute_blocking(cmd, self.system_command_options)
 
           unless result[:exit_code].zero?
@@ -364,7 +373,7 @@ module Bluepill
 
         logger.warning "Executing restart command: #{cmd}"
 
-        with_timeout(restart_grace_time) do
+        with_timeout(restart_grace_time, "restart") do
           result = System.execute_blocking(cmd, self.system_command_options)
 
           unless result[:exit_code].zero?
@@ -469,10 +478,10 @@ module Bluepill
       # Construct a new process wrapper for each new found children
       new_children_pids.each do |child_pid|
         ProcessJournal.append_pid_to_journal(name, child_pid)
-        name = "<child(pid:#{child_pid})>"
-        logger = self.logger.prefix_with(name)
+        child_name = "<child(pid:#{child_pid})>"
+        logger = self.logger.prefix_with(child_name)
 
-        child = self.child_process_factory.create_child_process(name, child_pid, logger)
+        child = self.child_process_factory.create_child_process(child_name, child_pid, logger)
         @children << child
       end
     end
@@ -496,13 +505,16 @@ module Bluepill
       }
     end
 
-    def with_timeout(secs, &blk)
-      Timeout.timeout(secs.to_f, &blk)
-
-    rescue Timeout::Error
-      logger.err "Execution is taking longer than expected. Unmonitoring."
-      logger.err "Did you forget to tell bluepill to daemonize this process?"
-      self.dispatch!("unmonitor")
+    def with_timeout(secs, next_state = nil, &blk)
+      # Attempt to execute the passed block. If the block takes
+      # too long, transition to the indicated next state.
+      begin
+        Timeout.timeout(secs.to_f, &blk)
+      rescue Timeout::Error
+        logger.err "Execution is taking longer than expected."
+        logger.err "Did you forget to tell bluepill to daemonize this process?"
+        dispatch!(next_state)
+      end
     end
   end
 end

data/lib/bluepill/process_conditions/file_time.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+module Bluepill
+  module ProcessConditions
+    class FileTime < ProcessCondition
+      def initialize(options = {})
+        @below = options[:below]
+        @filename = options[:filename]
+      end
+
+      def run(pid, include_children)
+        if File.exists?(@filename)
+          Time.now()-File::mtime(@filename)
+        else
+          nil
+        end
+      rescue
+        $!
+      end
+
+      def check(value)
+        return false if value.nil?
+        return value < @below
+      end
+    end
+  end
+end

data/lib/bluepill/process_conditions/http.rb

@@ -29,7 +29,7 @@ module Bluepill
         session.read_timeout = @read_timeout
         hide_net_http_bug do
           session.start do |http|
-            http.get(@uri.path)
+            http.get(@uri.request_uri)
           end
         end
       rescue

data/lib/bluepill/process_journal.rb

@@ -6,10 +6,17 @@ module Bluepill
 
     class << self
       attr_reader :logger
+      attr_reader :journal_base_dir
 
       def logger=(new_logger)
         @logger ||= new_logger
       end
+
+      def base_dir=(base_dir)
+        @journal_base_dir ||= File.join(base_dir, "journals")
+        FileUtils.mkdir_p(@journal_base_dir) unless File.exists?(@journal_base_dir)
+        FileUtils.chmod(0777, @journal_base_dir)
+      end
     end
 
     def skip_pid?(pid)
@@ -49,15 +56,15 @@ module Bluepill
     end
 
     def pid_journal_filename(journal_name)
-      ".bluepill_pids_journal.#{journal_name}"
+      File.join(@journal_base_dir, ".bluepill_pids_journal.#{journal_name}")
     end
 
     def pgid_journal_filename(journal_name)
-      ".bluepill_pgids_journal.#{journal_name}"
+      File.join(@journal_base_dir, ".bluepill_pgids_journal.#{journal_name}")
     end
 
     def pid_journal(filename)
-      logger.debug("pid journal PWD=#{Dir.pwd}")
+      logger.debug("pid journal file: #{filename}")
       result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pid| skip_pid?(pid)}
       logger.debug("pid journal = #{result.join(' ')}")
       result
@@ -66,7 +73,7 @@ module Bluepill
     end
 
     def pgid_journal(filename)
-      logger.debug("pgid journal PWD=#{Dir.pwd}")
+      logger.debug("pgid journal file: #{filename}")
       result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pgid| skip_pgid?(pgid)}
       logger.debug("pgid journal = #{result.join(' ')}")
       result

data/lib/bluepill/system.rb

@@ -106,11 +106,14 @@ module Bluepill
 
     def delete_if_exists(filename)
       tries = 0
-      File.unlink(filename) if filename && File.exists?(filename)
-    rescue IOError, Errno::ENOENT
-    rescue Errno::EACCES
-      retry if (tries += 1) < 3 
-      $stderr.puts("Warning: permission denied trying to delete #{filename}")
+
+      begin
+        File.unlink(filename) if filename && File.exists?(filename)
+      rescue IOError, Errno::ENOENT
+      rescue Errno::EACCES
+        retry if (tries += 1) < 3 
+        $stderr.puts("Warning: permission denied trying to delete #{filename}")
+      end
     end
 
     # Returns the stdout, stderr and exit code of the cmd

data/lib/bluepill/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Bluepill
-  VERSION = "0.0.62".freeze
+  VERSION = "0.0.63".freeze
 end

data/spec/lib/bluepill/process_spec.rb

@@ -0,0 +1,102 @@
+describe Bluepill::Process do
+  before(:all) do
+    Bluepill::ProcessJournal.base_dir = './.bluepill'
+    Bluepill::ProcessJournal.logger = Bluepill::Logger.new(:log_file => 'bluepill.log', :stdout => false).prefix_with('rspec')
+  end
+
+  subject do
+    Bluepill::Process.new(:proc_name, [],
+      :logger => Bluepill::Logger.new,
+    )
+  end
+
+  describe "#initialize" do
+    context "defaults" do
+      [
+        :start_command, :stop_command, :restart_command, :stdout, :stderr, :stdin,
+        :daemonize, :pid_file, :working_dir, :uid, :gid, :child_process_factory,
+        :pid_command, :auto_start, :supplementary_groups, :stop_signals
+      ].each do |attr|
+        its(attr) { should be_nil }
+      end
+      its(:monitor_children) { should be_false }
+      its(:cache_actual_pid) { should be_true }
+      its(:start_grace_time) { should eq 3 }
+      its(:stop_grace_time) { should eq 3 }
+      its(:restart_grace_time) { should eq 3 }
+      its(:on_start_timeout) { should eq "start" }
+      its(:environment) { should eq Hash[] }
+    end
+
+    context "overrides" do
+      subject { Bluepill::Process.new(:proc_name, [], :start_grace_time => 17) }
+      its(:start_grace_time) { should eq 17 }
+    end
+  end
+
+  describe "#start_process" do
+    it "functions" do
+      subject.stub(:start_command) { "/etc/init.d/script start" }
+      subject.stub(:on_start_timeout) { "freakout" }
+      subject.logger.stub(:warning)
+      subject.stub(:daemonize?) { false }
+
+      subject.should_receive(:with_timeout)
+        .with(3, "freakout")
+        .and_yield
+
+      Bluepill::System.should_receive(:execute_blocking)
+        .with("/etc/init.d/script start", subject.system_command_options)
+        .and_return(exit_code: 0)
+
+      subject.start_process
+    end
+
+    describe "#stop_process" do
+      it "functions" do
+        subject.stub(:stop_command) { "/etc/init.d/script stop" }
+        subject.logger.stub(:warning)
+        subject.should_receive(:with_timeout)
+          .with(3, "stop")
+          .and_yield
+
+        Bluepill::System.should_receive(:execute_blocking)
+          .with("/etc/init.d/script stop", subject.system_command_options)
+          .and_return(exit_code: 0)
+
+        subject.stop_process
+      end
+    end
+
+    describe "#restart_process" do
+      it "functions" do
+        subject.stub(:restart_command) { "/etc/init.d/script restart" }
+        subject.logger.stub(:warning)
+        subject.should_receive(:with_timeout)
+          .with(3, "restart")
+          .and_yield
+
+        Bluepill::System.should_receive(:execute_blocking)
+          .with("/etc/init.d/script restart", subject.system_command_options)
+          .and_return(exit_code: 0)
+
+        subject.restart_process
+      end
+    end
+  end
+
+  describe "#with_timeout" do
+    let(:block) { proc { nil } }
+
+    before(:each) do
+      subject.logger.stub(:err)
+      Timeout.should_receive(:timeout).with(3.to_f, &block).and_raise(Timeout::Error)
+    end
+
+    it "proceeds to next_state on timeout." do
+      subject.should_receive(:dispatch!).with("state_override")
+      subject.with_timeout(3, "state_override", &block)
+    end
+  end
+
+end

data/spec/lib/bluepill/system_spec.rb

@@ -1,12 +1,12 @@
 describe Bluepill::System do
   describe :pid_alive? do
     it "should be true if process responds to zero signal" do
-      mock(::Process).kill(0, 555)
+      Process.should_receive(:kill).with(0, 555).and_return(0)
       Bluepill::System.should be_pid_alive(555)
     end
 
     it "should be false if process throws exception on zero signal" do
-      mock(::Process).kill(0, 555) { raise Errno::ESRCH.new  }
+      Process.should_receive(:kill).with(0, 555).and_raise(Errno::ESRCH)
       Bluepill::System.should_not be_pid_alive(555)
     end
   end
@@ -33,4 +33,4 @@ describe Bluepill::System do
       Bluepill::System.store.should be_empty
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -12,8 +12,4 @@ require 'rspec/core'
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
-RSpec.configure do |conf|
-  conf.mock_with :rr
-end
-
 require 'bluepill'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.0.62
+  version: 0.0.63
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -110,13 +110,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,39 +124,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +203,7 @@ files:
 - lib/bluepill/process_conditions.rb
 - lib/bluepill/process_conditions/always_true.rb
 - lib/bluepill/process_conditions/cpu_usage.rb
+- lib/bluepill/process_conditions/file_time.rb
 - lib/bluepill/process_conditions/http.rb
 - lib/bluepill/process_conditions/mem_usage.rb
 - lib/bluepill/process_conditions/process_condition.rb
@@ -248,6 +217,7 @@ files:
 - lib/bluepill/version.rb
 - local-bluepill
 - spec/lib/bluepill/logger_spec.rb
+- spec/lib/bluepill/process_spec.rb
 - spec/lib/bluepill/process_statistics_spec.rb
 - spec/lib/bluepill/system_spec.rb
 - spec/spec_helper.rb
@@ -263,12 +233,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4302574804058768595
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4302574804058768595
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -277,6 +253,7 @@ specification_version: 3
 summary: A process monitor written in Ruby with stability and minimalism in mind.
 test_files:
 - spec/lib/bluepill/logger_spec.rb
+- spec/lib/bluepill/process_spec.rb
 - spec/lib/bluepill/process_statistics_spec.rb
 - spec/lib/bluepill/system_spec.rb
 - spec/spec_helper.rb