bluepill 0.0.68 → 0.0.69

data/lib/bluepill/process_conditions.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     def self.[](name)
@@ -7,8 +6,7 @@ module Bluepill
   end
 end
 
-require "bluepill/process_conditions/process_condition"
+require 'bluepill/process_conditions/process_condition'
 Dir["#{File.dirname(__FILE__)}/process_conditions/*.rb"].each do |pc|
   require pc
 end
-

data/lib/bluepill/process_conditions/always_true.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class AlwaysTrue < ProcessCondition
@@ -6,11 +5,11 @@ module Bluepill
         @below = options[:below]
       end
 
-      def run(pid, include_children)
+      def run(_pid, _include_children)
         1
       end
 
-      def check(value)
+      def check(_value)
         true
       end
     end

data/lib/bluepill/process_conditions/cpu_usage.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class CpuUsage < ProcessCondition

data/lib/bluepill/process_conditions/file_time.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class FileTime < ProcessCondition
@@ -7,19 +6,19 @@ module Bluepill
         @filename = options[:filename]
       end
 
-      def run(pid, include_children)
-        if File.exists?(@filename)
-          Time.now()-File::mtime(@filename)
+      def run(_pid, _include_children)
+        if File.exist?(@filename)
+          Time.now - File.mtime(@filename)
         else
           nil
         end
       rescue
-        $!
+        $ERROR_INFO
       end
 
       def check(value)
         return false if value.nil?
-        return value < @below
+        value < @below
       end
     end
   end

data/lib/bluepill/process_conditions/http.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'net/http'
 require 'uri'
 
@@ -8,8 +7,10 @@ module Bluepill
       def initialize(options = {})
         @uri = URI.parse(options[:url])
         @kind = case options[:kind]
-                  when Fixnum then Net::HTTPResponse::CODE_TO_OBJ[options[:kind].to_s]
-                  when String, Symbol then Net.const_get("HTTP#{options[:kind].to_s.camelize}")
+                when Fixnum
+                  Net::HTTPResponse::CODE_TO_OBJ[options[:kind].to_s]
+                when String, Symbol
+                  Net.const_get("HTTP#{options[:kind].to_s.camelize}")
                 else
                   Net::HTTPSuccess
                 end
@@ -18,11 +19,11 @@ module Bluepill
         @read_timeout = (options[:read_timeout] || options[:timeout] || 5).to_i
       end
 
-      def run(pid, include_children)
+      def run(_pid, _include_children)
         session = Net::HTTP.new(@uri.host, @uri.port)
         if @uri.scheme == 'https'
           require 'net/https'
-          session.use_ssl=true
+          session.use_ssl = true
           session.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
         session.open_timeout = @open_timeout
@@ -33,22 +34,23 @@ module Bluepill
           end
         end
       rescue
-        $!
+        $ERROR_INFO
       end
 
       def check(value)
-        return false unless value.kind_of?(@kind)
+        return false unless value.is_a?(@kind)
         return true  unless @pattern
         return false unless value.class.body_permitted?
         @pattern === value.body
       end
 
     private
+
       def hide_net_http_bug
         yield
       rescue NoMethodError => e
-        if e.to_s =~ /#{Regexp.escape(%q|undefined method `closed?' for nil:NilClass|)}/
-          raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{@uri.scheme}://#{@uri.host}:#{@uri.port}"
+        if e.to_s =~ /#{Regexp.escape("undefined method `closed?' for nil:NilClass")}/
+          raise(Errno::ECONNREFUSED.new("Connection refused attempting to contact #{@uri.scheme}://#{@uri.host}:#{@uri.port}"))
         else
           raise
         end

data/lib/bluepill/process_conditions/mem_usage.rb

@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class MemUsage < ProcessCondition
-      MB = 1024 ** 2
-      FORMAT_STR = "%d%s"
-      MB_LABEL = "MB"
-      KB_LABEL = "KB"
+      MB = 1024**2
+      FORMAT_STR = '%d%s'
+      MB_LABEL = 'MB'
+      KB_LABEL = 'KB'
 
       def initialize(options = {})
         @below = options[:below]
@@ -22,9 +21,9 @@ module Bluepill
 
       def format_value(value)
         if value.kilobytes >= MB
-          FORMAT_STR % [(value / 1024).round, MB_LABEL]
+          format(FORMAT_STR, (value / 1024).round, MB_LABEL)
         else
-          FORMAT_STR % [value, KB_LABEL]
+          format(FORMAT_STR, value, KB_LABEL)
         end
       end
     end

data/lib/bluepill/process_conditions/process_condition.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class ProcessCondition
@@ -6,12 +5,12 @@ module Bluepill
         @options = options
       end
 
-      def run(pid, include_children)
-        raise "Implement in subclass!"
+      def run(_pid, _include_children)
+        fail 'Implement in subclass!'
       end
 
-      def check(value)
-        raise "Implement in subclass!"
+      def check(_value)
+        fail 'Implement in subclass!'
       end
 
       def format_value(value)

data/lib/bluepill/process_conditions/running_time.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     class RunningTime < ProcessCondition
@@ -6,7 +5,7 @@ module Bluepill
         @below = options[:below]
       end
 
-      def run(pid, include_children)
+      def run(pid, _include_children)
         System.running_time(pid)
       end
 

data/lib/bluepill/process_conditions/zombie_process.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module ProcessConditions
     # Process must have cache_actual_pid set to false to function correctly:
@@ -7,7 +6,7 @@ module Bluepill
     # process.cache_actual_pid = false
 
     class ZombieProcess < ProcessCondition
-      def run(pid, include_children)
+      def run(pid, _include_children)
         System.command(pid)
       end
 

data/lib/bluepill/process_journal.rb

@@ -2,7 +2,7 @@ require 'bluepill/system'
 
 module Bluepill
   module ProcessJournal
-    extend self
+  module_function
 
     class << self
       attr_reader :logger
@@ -13,8 +13,8 @@ module Bluepill
       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)
+        @journal_base_dir ||= File.join(base_dir, 'journals')
+        FileUtils.mkdir_p(@journal_base_dir) unless File.exist?(@journal_base_dir)
         FileUtils.chmod(0777, @journal_base_dir)
       end
     end
@@ -39,7 +39,7 @@ module Bluepill
       times += 1
       logger.debug("Waiting for lock #{name}")
       sleep 1
-      unless times >= 10
+      if times < 10
         retry
       else
         logger.info("Timeout waiting for lock #{name}")
@@ -65,7 +65,7 @@ module Bluepill
 
     def pid_journal(filename)
       logger.debug("pid journal file: #{filename}")
-      result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pid| skip_pid?(pid)}
+      result = File.open(filename, 'r').readlines.map(&:to_i).reject { |pid| skip_pid?(pid) }
       logger.debug("pid journal = #{result.join(' ')}")
       result
     rescue Errno::ENOENT
@@ -74,7 +74,7 @@ module Bluepill
 
     def pgid_journal(filename)
       logger.debug("pgid journal file: #{filename}")
-      result = File.open(filename, 'r').readlines.map(&:to_i).reject {|pgid| skip_pgid?(pgid)}
+      result = File.open(filename, 'r').readlines.map(&:to_i).reject { |pgid| skip_pgid?(pgid) }
       logger.debug("pgid journal = #{result.join(' ')}")
       result
     rescue Errno::ENOENT
@@ -82,18 +82,15 @@ module Bluepill
     end
 
     def clear_atomic_fs_lock(name)
-      if File.directory?(name)
-        Dir.rmdir(name)
-        logger.debug("Cleared lock #{name}")
-      end
+      return unless File.directory?(name)
+      Dir.rmdir(name)
+      logger.debug("Cleared lock #{name}")
     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|
+      pids = Dir['.bluepill_pids_journal.*'].map { |p| p.sub(/^\.bluepill_pids_journal\./, '') }
+      pids.reject! { |p| p =~ /\.lock$/ }
+      pids.each do |journal_name|
         kill_all_from_journal(journal_name)
       end
     end
@@ -177,13 +174,13 @@ module Bluepill
 
       filename = pgid_journal_filename(journal_name)
       acquire_atomic_fs_lock(filename) do
-        unless pgid_journal(filename).include?(pgid)
+        if pgid_journal(filename).include?(pgid)
+          logger.debug("Skipping duplicate pgid #{pgid} already in journal #{journal_name}")
+        else
           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
@@ -200,13 +197,13 @@ module Bluepill
 
       filename = pid_journal_filename(journal_name)
       acquire_atomic_fs_lock(filename) do
-        unless pid_journal(filename).include?(pid)
+        if pid_journal(filename).include?(pid)
+          logger.debug("Skipping duplicate pid #{pid} already in journal #{journal_name}")
+        else
           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

data/lib/bluepill/process_statistics.rb

@@ -1,7 +1,6 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class ProcessStatistics
-    STRFTIME = "%m/%d/%Y %H:%I:%S".freeze
+    STRFTIME = '%m/%d/%Y %H:%I:%S'.freeze
     EVENTS_TO_PERSIST = 10
 
     attr_reader :events
@@ -17,11 +16,10 @@ module Bluepill
 
     def to_s
       str = events.reverse.map do |(event, reason, time)|
-        "  #{event} at #{time.strftime(STRFTIME)} - #{reason || "unspecified"}"
+        "  #{event} at #{time.strftime(STRFTIME)} - #{reason || 'unspecified'}"
       end.join("\n")
 
       "event history:\n#{str}"
     end
   end
 end
-

data/lib/bluepill/socket.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'socket'
 
 module Bluepill
@@ -6,7 +5,7 @@ module Bluepill
     TIMEOUT = 60 # Used for client commands
     MAX_ATTEMPTS = 5
 
-    extend self
+  module_function
 
     def client(base_dir, name, &block)
       UNIXSocket.open(socket_path(base_dir, name), &block)
@@ -25,7 +24,7 @@ module Bluepill
           break
         rescue EOFError, Timeout::Error
           if current_attempt == MAX_ATTEMPTS - 1
-            abort("Socket Timeout: Server may not be responding")
+            abort('Socket Timeout: Server may not be responding')
           end
           puts "Retry #{current_attempt + 1} of #{MAX_ATTEMPTS}"
         end
@@ -35,24 +34,22 @@ module Bluepill
 
     def server(base_dir, name)
       socket_path = self.socket_path(base_dir, name)
+      UNIXServer.open(socket_path)
+    rescue Errno::EADDRINUSE
       begin
-        UNIXServer.open(socket_path)
-      rescue Errno::EADDRINUSE
-        # if sock file has been created.  test to see if there is a server
-        begin
-          UNIXSocket.open(socket_path)
-        rescue Errno::ECONNREFUSED
-          File.delete(socket_path)
-          return UNIXServer.open(socket_path)
-        else
-          logger.err("Server is already running!")
-          exit(7)
-        end
+        # if sock file has been created, test to see if there is a server
+        UNIXSocket.open(socket_path)
+      rescue Errno::ECONNREFUSED
+        File.delete(socket_path)
+        return UNIXServer.open(socket_path)
+      else
+        logger.err('Server is already running!')
+        exit(7)
       end
     end
 
     def socket_path(base_dir, name)
-      File.join(base_dir, 'socks', name + ".sock")
+      File.join(base_dir, 'socks', name + '.sock')
     end
   end
 end

data/lib/bluepill/system.rb

@@ -1,13 +1,13 @@
-# -*- encoding: utf-8 -*-
 require 'etc'
-require "shellwords"
+require 'shellwords'
 
 module Bluepill
   # This class represents the system that 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"
-    extend self
+    APPEND_MODE = 'a'
+
+  module_function
 
     # The position of each field in ps output
     IDX_MAP = {
@@ -16,27 +16,25 @@ module Bluepill
       :pcpu => 2,
       :rss => 3,
       :etime => 4,
-      :command => 5
+      :command => 5,
     }
 
     def pid_alive?(pid)
-      begin
-        ::Process.kill(0, pid)
-        true
-      rescue Errno::EPERM # no permission, but it is definitely alive
-        true
-      rescue Errno::ESRCH
-        false
-      end
+      ::Process.kill(0, pid)
+      true
+    rescue Errno::EPERM # no permission, but it is definitely alive
+      true
+    rescue Errno::ESRCH
+      false
     end
 
     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|
+      get_children(pid).each do |child_pid|
         cpu_used += ps[child_pid][IDX_MAP[:pcpu]].to_f if ps[child_pid]
-      } if include_children
+      end if include_children
       cpu_used
     end
 
@@ -44,9 +42,9 @@ module Bluepill
       ps = ps_axu
       return unless ps[pid]
       mem_used = ps[pid][IDX_MAP[:rss]].to_f
-      get_children(pid).each { |child_pid|
+      get_children(pid).each do |child_pid|
         mem_used += ps[child_pid][IDX_MAP[:rss]].to_f if ps[child_pid]
-      } if include_children
+      end if include_children
       mem_used
     end
 
@@ -63,11 +61,11 @@ module Bluepill
     end
 
     def get_children(parent_pid)
-      child_pids = Array.new
-      ps_axu.each_pair do |pid, chunks|
+      child_pids = []
+      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
-      grand_children = child_pids.map{|pid| get_children(pid)}.flatten
+      grand_children = child_pids.map { |pid| get_children(pid) }.flatten
       child_pids.concat grand_children
     end
 
@@ -75,8 +73,9 @@ module Bluepill
     def daemonize(cmd, options = {})
       rd, wr = IO.pipe
 
-      if child = Daemonize.safefork
-        # we do not wanna create zombies, so detach ourselves from the child exit status
+      child = Daemonize.safefork
+      if child
+        # we don't want to create zombies, so detach ourselves from the child exit status
         ::Process.detach(child)
 
         # parent
@@ -86,7 +85,6 @@ module Bluepill
         rd.close
 
         return daemon_id if daemon_id > 0
-
       else
         # child
         rd.close
@@ -98,7 +96,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].to_s)  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))
@@ -109,12 +107,12 @@ module Bluepill
 
         daemon_id = Daemonize.call_as_daemon(to_daemonize, nil, cmd)
 
-        File.open(options[:pid_file], "w") {|f| f.write(daemon_id)}
+        File.open(options[:pid_file], 'w') { |f| f.write(daemon_id) }
 
         wr.write daemon_id
         wr.close
 
-        ::Process::exit!(true)
+        ::Process.exit!(true)
       end
     end
 
@@ -122,7 +120,7 @@ module Bluepill
       tries = 0
 
       begin
-        File.unlink(filename) if filename && File.exists?(filename)
+        File.unlink(filename) if filename && File.exist?(filename)
       rescue IOError, Errno::ENOENT
       rescue Errno::EACCES
         retry if (tries += 1) < 3
@@ -134,7 +132,8 @@ module Bluepill
     def execute_blocking(cmd, options = {})
       rd, wr = IO.pipe
 
-      if child = Daemonize.safefork
+      child = Daemonize.safefork
+      if child
         # parent
         wr.close
 
@@ -152,12 +151,12 @@ module Bluepill
         cmd_out_read, cmd_out_write = IO.pipe
         cmd_err_read, cmd_err_write = IO.pipe
 
-        pid = fork {
+        pid = fork do
           begin
             # grandchild
             drop_privileges(options[:uid], options[:gid], options[:supplementary_groups])
 
-            Dir.chdir(ENV["PWD"] = options[:working_dir].to_s) 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
@@ -166,7 +165,7 @@ module Bluepill
             wr.close
 
             # we do not care about stdin of cmd
-            STDIN.reopen("/dev/null")
+            STDIN.reopen('/dev/null')
 
             # point stdout of cmd to somewhere we can read
             cmd_out_read.close
@@ -180,12 +179,12 @@ module Bluepill
 
             # finally, replace grandchild with cmd
             ::Kernel.exec(*Shellwords.shellwords(cmd))
-          rescue Exception => e
-            (cmd_err_write.closed? ? STDERR : cmd_err_write).puts "Exception in grandchild: #{e.to_s}."
+          rescue => e
+            (cmd_err_write.closed? ? STDERR : cmd_err_write).puts "Exception in grandchild: #{e}."
             (cmd_err_write.closed? ? STDERR : cmd_err_write).puts e.backtrace
             exit 1
           end
-        }
+        end
 
         # we do not use these ends of the pipes in the child
         cmd_out_write.close
@@ -198,7 +197,7 @@ module Bluepill
         result = {
           :stdout => cmd_out_read.read,
           :stderr => cmd_err_read.read,
-          :exit_code => $?.exitstatus
+          :exit_code => $CHILD_STATUS.exitstatus,
         }
 
         # We're done with these ends of the pipes as well
@@ -214,7 +213,7 @@ module Bluepill
     end
 
     def store
-      @store ||= Hash.new
+      @store ||= {}
     end
 
     def reset_data
@@ -229,7 +228,7 @@ module Bluepill
 
         lines.inject(Hash.new) do |mem, line|
           chunks = line.split(/\s+/)
-          chunks.delete_if {|c| c.strip.empty? }
+          chunks.delete_if { |c| c.strip.empty? }
           pid = chunks[IDX_MAP[:pid]].strip.to_i
           command = chunks.slice!(IDX_MAP[:command], chunks.length).join ' '
           chunks[IDX_MAP[:command]] = command
@@ -242,11 +241,11 @@ module Bluepill
     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
+        days = (Regexp.last_match[1] || 0).to_i
+        hours = (Regexp.last_match[2] || 0).to_i
+        mins = Regexp.last_match[3].to_i
+        secs = Regexp.last_match[4].to_i
+        ((days * 24 + hours) * 60 + mins) * 60 + secs
       else
         0
       end
@@ -255,33 +254,28 @@ module Bluepill
     # 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)
-      if ::Process::Sys.geteuid == 0
-        uid_num = Etc.getpwnam(uid).uid if uid
-        gid_num = Etc.getgrnam(gid).gid if gid
-
-        supplementary_groups ||= []
-
-        group_nums = supplementary_groups.map do |group|
-          Etc.getgrnam(group).gid
-        end
-
-        ::Process.groups = [gid_num] if gid
-        ::Process.groups |= group_nums unless group_nums.empty?
-        ::Process::Sys.setgid(gid_num) if gid
-        ::Process::Sys.setuid(uid_num) if uid
-        ENV['HOME'] = Etc.getpwuid(uid_num).try(:dir) || ENV['HOME'] if uid
+      return unless ::Process::Sys.geteuid.zero?
+      uid_num = Etc.getpwnam(uid).uid if uid
+      gid_num = Etc.getgrnam(gid).gid if gid
+      supplementary_groups ||= []
+      group_nums = supplementary_groups.map do |group|
+        Etc.getgrnam(group).gid
       end
+      ::Process.groups = [gid_num] if gid
+      ::Process.groups |= group_nums unless group_nums.empty?
+      ::Process::Sys.setgid(gid_num) if gid
+      ::Process::Sys.setuid(uid_num) if uid
+      ENV['HOME'] = Etc.getpwuid(uid_num).try(:dir) || ENV['HOME'] if uid
     end
 
     def can_write_pid_file(pid_file, logger)
       FileUtils.touch(pid_file)
       File.unlink(pid_file)
-      return true
-
-    rescue Exception => e
-      logger.warning "%s - %s" % [e.class.name, e.message]
-      e.backtrace.each {|l| logger.warning l}
-      return false
+      true
+    rescue => e
+      logger.warning(format('%s - %s', e.class.name, e.message))
+      e.backtrace.each { |l| logger.warning l }
+      false
     end
 
     def redirect_io(io_in, io_out, io_err)