bluepill 0.0.63 → 0.0.64

data/README.md

@@ -87,6 +87,19 @@ To watch the modification time of a file, e.g. a log file to ensure the process
     end
  ```
 
+To restart process if it's running too long:
+
+```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 :running_time, :every => 10.minutes, :below => 24.hours
+      end
+    end
+ ```
+
 
 
 We can tell bluepill to give a process some grace time to start/stop/restart before resuming monitoring:

data/bin/bluepill

@@ -12,7 +12,7 @@ RbConfig = Config unless Object.const_defined?(:RbConfig)
 # Default options
 options = {
   :log_file   => "/var/log/bluepill.log",
-  :base_dir   => "/var/run/bluepill",
+  :base_dir   => ENV['BLUEPILL_BASE_DIR'] || (::Process.euid != 0 ? File.join(ENV['HOME'], '.bluepill') : "/var/run/bluepill"),
   :privileged => true,
   :timeout    => 10,
   :attempts   => 1
@@ -111,6 +111,7 @@ if options[:command] == "load"
     ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     load_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
     file_path = File.expand_path(file)
+    ENV['BLUEPILL_BASE_DIR'] = options[:base_dir]
 
     exec(ruby, "-I#{load_path}", '-rbluepill', file_path)
     

data/bluepill.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.add_dependency 'daemons', ['~> 1.1.4']
-  s.add_dependency 'state_machine', '~> 1.1.0'
+  s.add_dependency 'state_machine', '~> 1.1'
   s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_dependency 'i18n', '>= 0.5.0'
 

data/lib/bluepill/application.rb

@@ -16,7 +16,9 @@ module Bluepill
 
       @foreground   = options[:foreground]
       self.log_file = options[:log_file]
-      self.base_dir = ProcessJournal.base_dir = options[:base_dir] || '/var/run/bluepill'
+      self.base_dir = ProcessJournal.base_dir = options[:base_dir] || 
+        ENV['BLUEPILL_BASE_DIR'] ||
+        (::Process.euid != 0 ? File.join(ENV['HOME'], '.bluepill') : "/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/process.rb

@@ -281,7 +281,7 @@ module Bluepill
       logger.warning "Executing start command: #{start_command}"
       if self.daemonize?
         daemon_id = System.daemonize(start_command, self.system_command_options)
-        if daemon_id > 0
+        if daemon_id
           ProcessJournal.append_pid_to_journal(name, daemon_id)
           children.each {|child|
             ProcessJournal.append_pid_to_journal(name, child.actual_id)

data/lib/bluepill/process_conditions/running_time.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+module Bluepill
+  module ProcessConditions
+    class RunningTime < ProcessCondition
+      def initialize(options = {})
+        @below = options[:below]
+      end
+
+      def run(pid, include_children)
+        System.running_time(pid)
+      end
+
+      def check(value)
+        value < @below
+      end
+    end
+  end
+end

data/lib/bluepill/system.rb

@@ -14,7 +14,8 @@ module Bluepill
       :pid => 0,
       :ppid => 1,
       :pcpu => 2,
-      :rss => 3
+      :rss => 3,
+      :etime => 4
     }
 
     def pid_alive?(pid)
@@ -48,6 +49,12 @@ module Bluepill
       mem_used
     end
 
+    def running_time(pid)
+      ps = ps_axu
+      return unless ps[pid]
+      parse_elapsed_time(ps[pid][IDX_MAP[:etime]])
+    end
+
     def get_children(parent_pid)
       child_pids = Array.new
       ps_axu.each_pair do |pid, chunks|
@@ -189,7 +196,7 @@ module Bluepill
         wr.write Marshal.dump(result)
         wr.close
 
-        exit
+        ::Process.exit!
       end
     end
 
@@ -205,7 +212,7 @@ module Bluepill
       # TODO: need a mutex here
       store[:ps_axu] ||= begin
         # BSD style ps invocation
-        lines = `ps axo pid,ppid,pcpu,rss`.split("\n")
+        lines = `ps axo pid,ppid,pcpu,rss,etime`.split("\n")
 
         lines.inject(Hash.new) do |mem, line|
           chunks = line.split(/\s+/)
@@ -217,6 +224,19 @@ module Bluepill
       end
     end
 
+    def parse_elapsed_time(str)
+      # [[dd-]hh:]mm:ss
+      if str =~ /(?:(?:(\d+)-)?(\d\d):)?(\d\d):(\d\d)/
+        days = ($1 || 0).to_i
+        hours = ($2 || 0).to_i
+        mins = $3.to_i
+        secs = $4.to_i
+        ((days*24 + hours)*60 + mins)*60 + secs
+      else
+        0
+      end
+    end
+
     # be sure to call this from a fork otherwise it will modify the attributes
     # of the bluepill daemon
     def drop_privileges(uid, gid, supplementary_groups)

data/lib/bluepill/version.rb

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

data/local-bluepill

@@ -17,7 +17,7 @@ RbConfig = Config unless Object.const_defined?(:RbConfig)
 # Default options
 options = {
   :log_file   => "/var/log/bluepill.log",
-  :base_dir   => "/var/run/bluepill",
+  :base_dir   => ENV['BLUEPILL_BASE_DIR'] || (::Process.euid != 0 ? File.join(ENV['HOME'], '.bluepill') : "/var/run/bluepill"),
   :privileged => true,
   :timeout    => 10,
   :attempts   => 1
@@ -114,8 +114,9 @@ if options[:command] == "load"
     # Restart the ruby interpreter for the config file so that anything loaded here
     # does not stay in memory for the daemon
     ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-    load_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+    load_path = File.expand_path("#{File.dirname(__FILE__)}/lib")
     file_path = File.expand_path(file)
+    ENV['BLUEPILL_BASE_DIR'] = options[:base_dir]
 
     exec(ruby, "-I#{load_path}", '-rbluepill', file_path)
     

data/spec/lib/bluepill/application_spec.rb

@@ -0,0 +1,31 @@
+describe Bluepill::Application do
+  describe "#initialize" do
+    let(:options){ {} }
+    subject {described_class.new('test', options)}
+    before(:each) {described_class.any_instance.should_receive(:setup_pids_dir)}
+    
+    context "when euid is not root" do
+      before(:each) {::Process.stub(:euid).and_return(1)}
+      its(:base_dir){ should eq(File.join(ENV['HOME'], '.bluepill')) }
+    end
+    context "when euid is root" do
+      before(:each) {::Process.stub(:euid).and_return(0)}
+      its(:base_dir) { should eq('/var/run/bluepill') }
+    end
+    
+    context "when option base_dir is specified" do
+      let(:options) { {:base_dir=>'/var/bluepill'} }
+      its(:base_dir) { should eq(options[:base_dir]) }
+    end
+
+    context "when environment BLUEPILL_BASE_DIR is specified" do
+      before(:each) {ENV['BLUEPILL_BASE_DIR'] = '/bluepill'}
+      its(:base_dir) { should eq(ENV['BLUEPILL_BASE_DIR']) }
+
+      context "and option base_dir is specified" do
+        let(:options) { {:base_dir=>'/var/bluepill'} }
+        its(:base_dir) { should eq(options[:base_dir]) }
+      end
+    end
+  end
+end

data/spec/lib/bluepill/system_spec.rb

@@ -33,4 +33,13 @@ describe Bluepill::System do
       Bluepill::System.store.should be_empty
     end
   end
+
+  describe :parse_etime do
+    it "should parse etime format" do
+      Bluepill::System.parse_elapsed_time("400-00:04:01").should be_equal(34560241)
+      Bluepill::System.parse_elapsed_time("02:04:02").should be_equal(7442)
+      Bluepill::System.parse_elapsed_time("20:03").should be_equal(1203)
+      Bluepill::System.parse_elapsed_time("invalid").should be_equal(0)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -12,4 +12,10 @@ require 'rspec/core'
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
+module Process
+  def self.euid
+    raise "Process.euid should be stubbed"
+  end
+end
+
 require 'bluepill'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.0.63
+  version: 0.0.64
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/bluepill/process_conditions/http.rb
 - lib/bluepill/process_conditions/mem_usage.rb
 - lib/bluepill/process_conditions/process_condition.rb
+- lib/bluepill/process_conditions/running_time.rb
 - lib/bluepill/process_journal.rb
 - lib/bluepill/process_statistics.rb
 - lib/bluepill/socket.rb
@@ -216,6 +217,7 @@ files:
 - lib/bluepill/util/rotational_array.rb
 - lib/bluepill/version.rb
 - local-bluepill
+- spec/lib/bluepill/application_spec.rb
 - spec/lib/bluepill/logger_spec.rb
 - spec/lib/bluepill/process_spec.rb
 - spec/lib/bluepill/process_statistics_spec.rb
@@ -235,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4302574804058768595
+      hash: -2865814049117051220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4302574804058768595
+      hash: -2865814049117051220
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -252,6 +254,7 @@ signing_key:
 specification_version: 3
 summary: A process monitor written in Ruby with stability and minimalism in mind.
 test_files:
+- spec/lib/bluepill/application_spec.rb
 - spec/lib/bluepill/logger_spec.rb
 - spec/lib/bluepill/process_spec.rb
 - spec/lib/bluepill/process_statistics_spec.rb