bluepill 0.0.60 → 0.0.61

data/README.md

@@ -149,6 +149,17 @@ You can also set an app-wide uid/gid:
     end
 ```
 
+To track resources of child processes, use :include_children:
+```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 :mem_usage, :every => 1.seconds, :below => 5.megabytes, :times => [3,5], :include_children => true
+      end
+    end
+```
+
 To check for flapping:
 
 ```ruby
@@ -254,23 +265,39 @@ We recommend that you _not_ do that and instead use the config options to captur
 The main benefit of using the config options is that Bluepill will be able to monitor the correct process instead of just watching the shell that spawned your actual server.
 
 ### CLI
-To start a bluepill process and load a config:
+
+#### Usage
+
+    bluepill [app_name] command [options]
+	
+For the "load" command, the _app_name_ is specified in the config file, and
+must not be provided on the command line.
+
+For all other commands, the _app_name_ is optional if there is only
+one bluepill daemon running. Otherwise, the _app_name_ must be
+provided, because the command will fail when there are multiple
+bluepill daemons running. The example commands below leaves out the
+_app_name_.
+
+#### Commands
+
+To start a bluepill daemon and load the config for an application:
 
     sudo bluepill load /path/to/production.pill
 
-To act on a process or group:
+To act on a process or group for an application:
 
     sudo bluepill <start|stop|restart|unmonitor> <process_or_group_name>
 
-To view process statuses:
+To view process statuses for an application:
 
     sudo bluepill status
 
-To view the log for a process or group:
+To view the log for a process or group for an application:
 
     sudo bluepill log <process_or_group_name>
 
-To quit bluepill:
+To quit the bluepill daemon for an application:
 
     sudo bluepill quit
 

data/bluepill.gemspec

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

data/lib/bluepill/application.rb

@@ -1,11 +1,13 @@
 # -*- encoding: utf-8 -*-
 require 'thread'
+require 'bluepill/system'
+require 'bluepill/process_journal'
 
 module Bluepill
   class Application
     PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor, :status]
 
-    attr_accessor :name, :logger, :base_dir, :socket, :pid_file
+    attr_accessor :name, :logger, :base_dir, :socket, :pid_file, :kill_timeout
     attr_accessor :groups, :work_queue
     attr_accessor :pids_dir, :log_file
 
@@ -17,10 +19,11 @@ module Bluepill
       self.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
 
       self.groups = {}
 
-      self.logger = Bluepill::Logger.new(:log_file => self.log_file, :stdout => foreground?).prefix_with(self.name)
+      self.logger = ProcessJournal.logger = Bluepill::Logger.new(:log_file => self.log_file, :stdout => foreground?).prefix_with(self.name)
 
       self.setup_signal_traps
       self.setup_pids_dir
@@ -115,6 +118,9 @@ module Bluepill
 
     def start_server
       self.kill_previous_bluepill
+      ProcessJournal.kill_all_from_all_journals
+      ProcessJournal.clear_all_atomic_fs_locks
+      ::Process.setpgid(0, 0)
 
       Daemonize.daemonize unless foreground?
 
@@ -141,17 +147,22 @@ module Bluepill
         end
         sleep 1
       end
-      cleanup
     end
 
     def cleanup
-      File.unlink(self.socket.path) if self.socket
-      File.unlink(self.pid_file) if File.exists?(self.pid_file)
+      ProcessJournal.kill_all_from_all_journals
+      ProcessJournal.clear_all_atomic_fs_locks
+      begin
+        System.delete_if_exists(self.socket.path) if self.socket
+      rescue IOError
+      end
+      System.delete_if_exists(self.pid_file)
     end
 
     def setup_signal_traps
       terminator = Proc.new do
         puts "Terminating..."
+        cleanup
         @running = false
       end
 
@@ -183,7 +194,7 @@ module Bluepill
             $stderr.puts "#{e.class}: #{e.message}"
             exit(4) unless e.is_a?(Errno::ESRCH)
           else
-            10.times do |i|
+            kill_timeout.times do |i|
               sleep 0.5
               break unless System.pid_alive?(previous_pid)
             end

data/lib/bluepill/condition_watch.rb

@@ -15,6 +15,7 @@ module Bluepill
       @every  = options.delete(:every)
       @times  = options.delete(:times) || [1,1]
       @times  = [@times, @times] unless @times.is_a?(Array) # handles :times => 5
+      @include_children = options.delete(:include_children) || false
 
       self.clear_history!
 
@@ -25,7 +26,7 @@ module Bluepill
       if @last_ran_at.nil? || (@last_ran_at + @every) <= tick_number
         @last_ran_at = tick_number
 
-        value = @process_condition.run(pid)
+        value = @process_condition.run(pid, @include_children)
         @history << HistoryValue.new(@process_condition.format_value(value), @process_condition.check(value))
         self.logger.info(self.to_s)
 

data/lib/bluepill/controller.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'fileutils'
+require 'bluepill/system'
 
 module Bluepill
   class Controller
@@ -90,8 +91,8 @@ module Bluepill
         if !pid || !System.pid_alive?(pid)
           pid_file = File.join(self.pids_dir, "#{app}.pid")
           sock_file = File.join(self.sockets_dir, "#{app}.sock")
-          File.unlink(pid_file) if File.exists?(pid_file)
-          File.unlink(sock_file) if File.exists?(sock_file)
+          System.delete_if_exists(pid_file)
+          System.delete_if_exists(sock_file)
         end
       end
     end

data/lib/bluepill/process.rb

@@ -5,10 +5,13 @@ gem "state_machine"
 
 require "state_machine"
 require "daemons"
+require "bluepill/system"
+require "bluepill/process_journal"
 
 module Bluepill
   class Process
     CONFIGURABLE_ATTRIBUTES = [
+      :pre_start_command,
       :start_command,
       :stop_command,
       :restart_command,
@@ -263,11 +266,19 @@ module Bluepill
     end
 
     def start_process
+      ProcessJournal.kill_all_from_journal(name) # be sure nothing else is running from previous runs
+      pre_start_process
       logger.warning "Executing start command: #{start_command}"
-
       if self.daemonize?
-        System.daemonize(start_command, self.system_command_options)
-
+        daemon_id = System.daemonize(start_command, self.system_command_options)
+        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)
+          } if self.monitor_children?
+        end
+        daemon_id
       else
         # This is a self-daemonizing process
         with_timeout(start_grace_time) do
@@ -283,7 +294,23 @@ module Bluepill
       self.skip_ticks_for(start_grace_time)
     end
 
+    def pre_start_process
+      return unless pre_start_command
+      logger.warning "Executing pre start command: #{pre_start_command}"
+      result = System.execute_blocking(pre_start_command, self.system_command_options)
+      unless result[:exit_code].zero?
+        logger.warning "Pre start command execution returned non-zero exit code:"
+        logger.warning result.inspect
+      end
+    end
+
     def stop_process
+      if monitor_children
+        System.get_children(self.actual_pid).each do |child_pid|
+          ProcessJournal.append_pid_to_journal(name, child_pid)
+        end
+      end
+
       if stop_command
         cmd = self.prepare_command(stop_command)
         logger.warning "Executing stop command: #{cmd}"
@@ -325,6 +352,7 @@ module Bluepill
         logger.warning "Executing default stop command. Sending TERM signal to #{actual_pid}"
         signal_process("TERM")
       end
+      ProcessJournal.kill_all_from_journal(name) # finish cleanup
       self.unlink_pid # TODO: we only write the pid file if we daemonize, should we only unlink it if we daemonize?
 
       self.skip_ticks_for(stop_grace_time)
@@ -404,6 +432,7 @@ module Bluepill
     end
 
     def actual_pid=(pid)
+      ProcessJournal.append_pid_to_journal(name, pid) # be sure to always log the pid
       @actual_pid = pid
     end
 
@@ -412,8 +441,7 @@ module Bluepill
     end
 
     def unlink_pid
-      File.unlink(pid_file) if pid_file && File.exists?(pid_file)
-    rescue Errno::ENOENT
+      System.delete_if_exists(pid_file)
     end
 
      # Internal State Methods
@@ -440,6 +468,7 @@ 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)
 

data/lib/bluepill/process_conditions/always_true.rb

@@ -6,7 +6,7 @@ module Bluepill
         @below = options[:below]
       end
 
-      def run(pid)
+      def run(pid, include_children)
         1
       end
 
@@ -15,4 +15,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/process_conditions/cpu_usage.rb

@@ -6,9 +6,9 @@ module Bluepill
         @below = options[:below]
       end
 
-      def run(pid)
+      def run(pid, include_children)
         # third col in the ps axu output
-        System.cpu_usage(pid).to_f
+        System.cpu_usage(pid, include_children).to_f
       end
 
       def check(value)
@@ -16,4 +16,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/process_conditions/http.rb

@@ -18,7 +18,7 @@ module Bluepill
         @read_timeout = (options[:read_timeout] || options[:timeout] || 5).to_i
       end
 
-      def run(pid)
+      def run(pid, include_children)
         session = Net::HTTP.new(@uri.host, @uri.port)
         if @uri.scheme == 'https'
           require 'net/https'

data/lib/bluepill/process_conditions/mem_usage.rb

@@ -11,9 +11,9 @@ module Bluepill
         @below = options[:below]
       end
 
-      def run(pid)
+      def run(pid, include_children)
         # rss is on the 5th col
-        System.memory_usage(pid).to_f
+        System.memory_usage(pid, include_children).to_f
       end
 
       def check(value)
@@ -29,4 +29,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/process_conditions/process_condition.rb

@@ -6,7 +6,7 @@ module Bluepill
         @options = options
       end
 
-      def run(pid)
+      def run(pid, include_children)
         raise "Implement in subclass!"
       end
 
@@ -19,4 +19,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/process_journal.rb

@@ -0,0 +1,207 @@
+require 'bluepill/system'
+
+module Bluepill
+  module ProcessJournal
+    extend self
+
+    class << self
+      attr_reader :logger
+
+      def logger=(new_logger)
+        @logger ||= new_logger
+      end
+    end
+
+    def skip_pid?(pid)
+      !pid.is_a?(Integer) || pid <= 1
+    end
+
+    def skip_pgid?(pgid)
+      !pgid.is_a?(Integer) || pgid <= 1
+    end
+
+    # atomic operation on POSIX filesystems, since
+    # f.flock(File::LOCK_SH) is not available on all platforms
+    def acquire_atomic_fs_lock(name)
+      times = 0
+      name += '.lock'
+      Dir.mkdir name, 0700
+      logger.debug("Acquired lock #{name}")
+      yield
+    rescue Errno::EEXIST
+      times += 1
+      logger.debug("Waiting for lock #{name}")
+      sleep 1
+      unless times >= 10
+        retry
+      else
+        logger.info("Timeout waiting for lock #{name}")
+        raise "Timeout waiting for lock #{name}"
+      end
+    ensure
+      clear_atomic_fs_lock(name)
+    end
+
+    def clear_all_atomic_fs_locks
+      Dir['.*.lock'].each do |f|
+        System.delete_if_exists(f) if File.directory?(f)
+      end
+    end
+
+    def pid_journal_filename(journal_name)
+      ".bluepill_pids_journal.#{journal_name}"
+    end
+
+    def pgid_journal_filename(journal_name)
+      ".bluepill_pgids_journal.#{journal_name}"
+    end
+
+    def pid_journal(filename)
+      logger.debug("pid journal PWD=#{Dir.pwd}")
+      result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pid| skip_pid?(pid)}
+      logger.debug("pid journal = #{result.join(' ')}")
+      result
+    rescue Errno::ENOENT
+      []
+    end
+
+    def pgid_journal(filename)
+      logger.debug("pgid journal PWD=#{Dir.pwd}")
+      result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pgid| skip_pgid?(pgid)}
+      logger.debug("pgid journal = #{result.join(' ')}")
+      result
+    rescue Errno::ENOENT
+      []
+    end
+
+    def clear_atomic_fs_lock(name)
+      if File.directory?(name)
+        Dir.rmdir(name)
+        logger.debug("Cleared lock #{name}")
+      end
+    end
+
+    def kill_all_from_all_journals
+      Dir[".bluepill_pids_journal.*"].map { |x|
+        x.sub(/^\.bluepill_pids_journal\./,"")
+      }.reject { |y|
+        y =~ /\.lock$/
+      }.each do |journal_name|
+        kill_all_from_journal(journal_name)
+      end
+    end
+
+    def kill_all_from_journal(journal_name)
+      kill_all_pids_from_journal(journal_name)
+      kill_all_pgids_from_journal(journal_name)
+    end
+
+    def kill_all_pgids_from_journal(journal_name)
+      filename = pgid_journal_filename(journal_name)
+      j = pgid_journal(filename)
+      if j.length > 0
+        acquire_atomic_fs_lock(filename) do
+          j.each do |pgid|
+            begin
+              ::Process.kill('TERM', -pgid)
+              logger.info("Termed old process group #{pgid}")
+            rescue Errno::ESRCH
+              logger.debug("Unable to term missing process group #{pgid}")
+            end
+          end
+
+          if j.select { |pgid| System.pid_alive?(pgid) }.length > 1
+            sleep(1)
+            j.each do |pgid|
+              begin
+                ::Process.kill('KILL', -pgid)
+                logger.info("Killed old process group #{pgid}")
+              rescue Errno::ESRCH
+                logger.debug("Unable to kill missing process group #{pgid}")
+              end
+            end
+          end
+          System.delete_if_exists(filename) # reset journal
+          logger.debug('Journal cleanup completed')
+        end
+      else
+        logger.debug('No previous process journal - Skipping cleanup')
+      end
+    end
+
+    def kill_all_pids_from_journal(journal_name)
+      filename = pid_journal_filename(journal_name)
+      j = pid_journal(filename)
+      if j.length > 0
+        acquire_atomic_fs_lock(filename) do
+          j.each do |pid|
+            begin
+              ::Process.kill('TERM', pid)
+              logger.info("Termed old process #{pid}")
+            rescue Errno::ESRCH
+              logger.debug("Unable to term missing process #{pid}")
+            end
+          end
+
+          if j.select { |pid| System.pid_alive?(pid) }.length > 1
+            sleep(1)
+            j.each do |pid|
+              begin
+                ::Process.kill('KILL', pid)
+                logger.info("Killed old process #{pid}")
+              rescue Errno::ESRCH
+                logger.debug("Unable to kill missing process #{pid}")
+              end
+            end
+          end
+          System.delete_if_exists(filename) # reset journal
+          logger.debug('Journal cleanup completed')
+        end
+      else
+        logger.debug('No previous process journal - Skipping cleanup')
+      end
+    end
+
+    def append_pgid_to_journal(journal_name, pgid)
+      if skip_pgid?(pgid)
+        logger.debug("Skipping invalid pgid #{pgid} (class #{pgid.class})")
+        return
+      end
+
+      filename = pgid_journal_filename(journal_name)
+      acquire_atomic_fs_lock(filename) do
+        unless pgid_journal(filename).include?(pgid)
+          logger.debug("Saving pgid #{pgid} to process journal #{journal_name}")
+          File.open(filename, 'a+', 0600) { |f| f.puts(pgid) }
+          logger.info("Saved pgid #{pgid} to journal #{journal_name}")
+          logger.debug("Journal now = #{File.open(filename, 'r').read}")
+        else
+          logger.debug("Skipping duplicate pgid #{pgid} already in journal #{journal_name}")
+        end
+      end
+    end
+
+    def append_pid_to_journal(journal_name, pid)
+      begin
+        append_pgid_to_journal(journal_name, ::Process.getpgid(pid))
+      rescue Errno::ESRCH
+      end
+      if skip_pid?(pid)
+        logger.debug("Skipping invalid pid #{pid} (class #{pid.class})")
+        return
+      end
+
+      filename = pid_journal_filename(journal_name)
+      acquire_atomic_fs_lock(filename) do
+        unless pid_journal(filename).include?(pid)
+          logger.debug("Saving pid #{pid} to process journal #{journal_name}")
+          File.open(filename, 'a+', 0600) { |f| f.puts(pid) }
+          logger.info("Saved pid #{pid} to journal #{journal_name}")
+          logger.debug("Journal now = #{File.open(filename, 'r').read}")
+        else
+          logger.debug("Skipping duplicate pid #{pid} already in journal #{journal_name}")
+        end
+      end
+    end
+  end
+end

data/lib/bluepill/system.rb

@@ -21,17 +21,31 @@ module Bluepill
       begin
         ::Process.kill(0, pid)
         true
+      rescue Errno::EPERM # no permission, but it is definitely alive
+        true
       rescue Errno::ESRCH
         false
       end
     end
 
-    def cpu_usage(pid)
-      ps_axu[pid] && ps_axu[pid][IDX_MAP[:pcpu]].to_f
+    def cpu_usage(pid, include_children)
+      ps = ps_axu
+      return unless ps[pid]
+      cpu_used = ps[pid][IDX_MAP[:pcpu]].to_f
+      get_children(pid).each { |child_pid|
+        cpu_used += ps[child_pid][IDX_MAP[:pcpu]].to_f if ps[child_pid]
+      } if include_children
+      cpu_used 
     end
 
-    def memory_usage(pid)
-      ps_axu[pid] && ps_axu[pid][IDX_MAP[:rss]].to_f
+    def memory_usage(pid, include_children)
+      ps = ps_axu
+      return unless ps[pid]
+      mem_used = ps[pid][IDX_MAP[:rss]].to_f
+      get_children(pid).each { |child_pid|
+        mem_used += ps[child_pid][IDX_MAP[:rss]].to_f if ps[child_pid]
+      } if include_children
+      mem_used
     end
 
     def get_children(parent_pid)
@@ -39,7 +53,8 @@ module Bluepill
       ps_axu.each_pair do |pid, chunks|
         child_pids << chunks[IDX_MAP[:pid]].to_i if chunks[IDX_MAP[:ppid]].to_i == parent_pid.to_i
       end
-      child_pids
+      grand_children = child_pids.map{|pid| get_children(pid)}.flatten
+      child_pids.concat grand_children 
     end
 
     # Returns the pid of the child that executes the cmd
@@ -69,7 +84,7 @@ module Bluepill
 
         to_daemonize = lambda do
           # Setting end PWD env emulates bash behavior when dealing with symlinks
-          Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
+          Dir.chdir(ENV["PWD"] = options[:working_dir].to_s)  if options[:working_dir]
           options[:environment].each { |key, value| ENV[key.to_s] = value.to_s } if options[:environment]
 
           redirect_io(*options.values_at(:stdin, :stdout, :stderr))
@@ -89,6 +104,15 @@ module Bluepill
       end
     end
 
+    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}")
+    end
+
     # Returns the stdout, stderr and exit code of the cmd
     def execute_blocking(cmd, options = {})
       rd, wr = IO.pipe
@@ -115,7 +139,7 @@ module Bluepill
           # grandchild
           drop_privileges(options[:uid], options[:gid], options[:supplementary_groups])
 
-          Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
+          Dir.chdir(ENV["PWD"] = options[:working_dir].to_s) if options[:working_dir]
           options[:environment].each { |key, value| ENV[key.to_s] = value.to_s } if options[:environment]
 
           # close unused fds so ancestors wont hang. This line is the only reason we are not

data/lib/bluepill/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
   prerelease: 
 platform: ruby
 authors:
@@ -11,25 +11,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2154561020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154561020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2154560280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +39,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154560280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154559820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,10 +55,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154559820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154559340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,10 +71,15 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154559340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154558840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,10 +87,15 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2154558840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154558280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '!='
@@ -81,10 +103,15 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2154558280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2154557740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +119,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2154557740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2154544000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +135,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2154544000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2154543540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +151,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2154543540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2154543080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +167,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2154543080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154542580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,7 +183,12 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2154542580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 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
@@ -186,6 +238,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_journal.rb
 - lib/bluepill/process_statistics.rb
 - lib/bluepill/socket.rb
 - lib/bluepill/system.rb
@@ -218,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A process monitor written in Ruby with stability and minimalism in mind.