eye 0.8.celluloid15 → 0.8.pre

data/eye.gemspec

@@ -1,29 +1,29 @@
 require File.expand_path('../lib/eye', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = 'Konstantin Makarchev'
-  gem.email         = 'eye-rb@googlegroups.com'
+  gem.authors       = "Konstantin Makarchev"
+  gem.email         = "eye-rb@googlegroups.com"
 
   gem.description   = gem.summary = \
-    'Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI) >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.'
-  gem.homepage      = 'http://github.com/kostya/eye'
+    %q{Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI) >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.}
+  gem.homepage      = "http://github.com/kostya/eye"
 
-  gem.files         = `git ls-files`.split($\).reject { |n| n =~ %r[png|gif\z] }.reject { |n| n =~ %r[^(test|spec|features)/] }
-  gem.executables   = gem.files.grep(%r[^bin/]).map { |f| File.basename(f) }
-  # gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = 'eye'
-  gem.require_paths = ['lib']
+  gem.files         = `git ls-files`.split($\).reject{|n| n =~ %r[png|gif\z]}.reject{|n| n =~ %r[^(test|spec|features)/]}
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  #gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "eye"
+  gem.require_paths = ["lib"]
   gem.version       = Eye::VERSION
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
   gem.required_ruby_version     = '>= 1.9.2'
   gem.required_rubygems_version = '>= 1.3.6'
 
-  gem.add_dependency 'celluloid',     '~> 0.15.0'
-  gem.add_dependency 'celluloid-io',  '~> 0.15.0'
+  gem.add_dependency 'celluloid',     '~> 0.17.0'
+  gem.add_dependency 'celluloid-io',  '~> 0.17.0'
   gem.add_dependency 'state_machine'
   gem.add_dependency 'thor'
-  gem.add_dependency 'sigar', '~> 0.7.3'
+  gem.add_dependency 'sigar',         '~> 0.7.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '< 2.14'
@@ -31,15 +31,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'ruby-graphviz'
   gem.add_development_dependency 'forking'
   gem.add_development_dependency 'fakeweb'
-  gem.add_development_dependency 'eventmachine', '>= 1.0.3'
+  gem.add_development_dependency 'eventmachine', ">= 1.0.3"
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'
   gem.add_development_dependency 'slack-notifier'
   gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'tins', '1.6.0' # for coveralls
   gem.add_development_dependency 'simplecov', '>= 0.8.1'
   gem.add_development_dependency 'parallel_tests', '<= 1.3.1'
   gem.add_development_dependency 'parallel_split_test'
-  gem.add_development_dependency 'rubocop'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = '0.8.celluloid15'
+  VERSION   = "0.8.pre"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
@@ -8,7 +8,7 @@ module Eye
   autoload :Server,         'eye/server'
   autoload :Logger,         'eye/logger'
   autoload :System,         'eye/system'
-  autoload :SystemResources, 'eye/system_resources'
+  autoload :SystemResources,'eye/system_resources'
   autoload :Checker,        'eye/checker'
   autoload :Trigger,        'eye/trigger'
   autoload :Group,          'eye/group'
@@ -21,6 +21,7 @@ module Eye
   autoload :Config,         'eye/config'
   autoload :Reason,         'eye/reason'
   autoload :Sigar,          'eye/sigar'
+
   autoload :Controller,     'eye/controller'
   autoload :Control,        'eye/control'
   autoload :Cli,            'eye/cli'

data/lib/eye/application.rb

@@ -21,12 +21,13 @@ class Eye::Application
     @groups << group
   end
 
+  # sort processes in name order
   def resort_groups
-    @groups.sort! # used group method <=> to compare
+    @groups = @groups.sort { |a, b| a.hidden ? 1 : (b.hidden ? -1 : (a.name <=> b.name)) }
   end
 
-  def status_data(opts = {})
-    h = { name: @name, type: :application, subtree: @groups.map { |gr| gr.status_data(opts) } }
+  def status_data(debug = false)
+    h = { name: @name, type: :application, subtree: @groups.map{|gr| gr.status_data(debug) }}
     h[:debug] = debug_data if debug
     h
   end
@@ -52,13 +53,13 @@ class Eye::Application
 
   def sub_object?(obj)
     res = @groups.include?(obj)
-    res = @groups.any? { |gr| gr.sub_object?(obj) } unless res
+    res = @groups.any?{|gr| gr.sub_object?(obj)} if !res
     res
   end
 
   def processes
     out = []
-    @groups.each { |gr| out += gr.processes.to_a }
+    @groups.each{|gr| out += gr.processes.to_a }
     Eye::Utils::AliveArray.new(out)
   end
 

data/lib/eye/checker.rb

@@ -1,5 +1,4 @@
 class Eye::Checker
-
   include Eye::Dsl::Validation
 
   autoload :Memory,     'eye/checker/memory'
@@ -7,35 +6,35 @@ class Eye::Checker
   autoload :Http,       'eye/checker/http'
   autoload :FileCTime,  'eye/checker/file_ctime'
   autoload :FileSize,   'eye/checker/file_size'
-  autoload :FileTouched, 'eye/checker/file_touched'
+  autoload :FileTouched,'eye/checker/file_touched'
   autoload :Socket,     'eye/checker/socket'
   autoload :SslSocket,  'eye/checker/ssl_socket'
   autoload :Nop,        'eye/checker/nop'
   autoload :Runtime,    'eye/checker/runtime'
   autoload :Cputime,    'eye/checker/cputime'
   autoload :ChildrenCount, 'eye/checker/children_count'
-  autoload :ChildrenMemory, 'eye/checker/children_memory'
+  autoload :ChildrenMemory,'eye/checker/children_memory'
 
-  TYPES = { memory: 'Memory', cpu: 'Cpu', http: 'Http',
-            ctime: 'FileCTime', fsize: 'FileSize', file_touched: 'FileTouched',
-            socket: 'Socket', nop: 'Nop', runtime: 'Runtime', cputime: 'Cputime',
-            children_count: 'ChildrenCount', children_memory: 'ChildrenMemory', ssl_socket: 'SslSocket' }
+  TYPES = {:memory => 'Memory', :cpu => 'Cpu', :http => 'Http',
+           :ctime => 'FileCTime', :fsize => 'FileSize', :file_touched => 'FileTouched',
+           :socket => 'Socket', :nop => 'Nop', :runtime => 'Runtime', :cputime => 'Cputime',
+           :children_count => "ChildrenCount", :children_memory => "ChildrenMemory", :ssl_socket => 'SslSocket' }
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count, :process
 
   param :every, [Fixnum, Float], false, 5
   param :times, [Fixnum, Array], nil, 1
-  param :fires, [Symbol, Array, Proc], nil, nil, [:stop, :restart, :unmonitor, :start, :delete, :nothing, :notify]
+  param :fires, [Symbol, Array], nil, nil, [:stop, :restart, :unmonitor, :start, :delete, :nothing, :notify]
   param :initial_grace, [Fixnum, Float]
   param :skip_initial_fails, [TrueClass, FalseClass]
 
   def self.name_and_class(type)
     type = type.to_sym
-    return { name: type, type: type } if TYPES[type]
+    return {:name => type, :type => type} if TYPES[type]
 
-    if type =~ %r[\A(.*?)_?[0-9]+\z]
-      ctype = Regexp.last_match(1).to_sym
-      return { name: type, type: ctype } if TYPES[ctype]
+    if type =~ /\A(.*?)_?[0-9]+\z/
+      ctype = $1.to_sym
+      return {:name => type, :type => ctype} if TYPES[ctype]
     end
   end
 
@@ -51,7 +50,7 @@ class Eye::Checker
   def self.create(pid, options = {}, process = nil)
     get_class(options[:type]).new(pid, options, process)
 
-  rescue Object => ex
+  rescue Exception, Timeout::Error => ex
     log_ex(ex)
     nil
   end
@@ -80,11 +79,11 @@ class Eye::Checker
   end
 
   def logger_tag
-    @logger_tag ||= @process ? @process.logger.prefix : nil
+    @process.logger.prefix if @process
   end
 
   def logger_sub_tag
-    @logger_sub_tag ||= "check:#{check_name}"
+    "check:#{check_name}"
   end
 
   def last_human_values
@@ -97,24 +96,22 @@ class Eye::Checker
   end
 
   def check
-    if initial_grace
-      if Time.now - @initialized_at < initial_grace
-        debug { 'skipped initial grace' }
-        return true
-      else
-        @options[:initial_grace] = nil
-      end
+    if initial_grace && (Time.now - @initialized_at < initial_grace)
+      debug { 'skipped initial grace' }
+      return true
+    else
+      @options[:initial_grace] = nil
     end
 
     @value = get_value_safe
     @good_value = good?(value)
-    @values << { value: @value, good: @good_value }
+    @values << {:value => @value, :good => @good_value}
 
     result = true
     @check_count += 1
 
     if @values.size == max_tries
-      bad_count = @values.count { |v| !v[:good] }
+      bad_count = @values.count{|v| !v[:good] }
       result = false if bad_count >= min_tries
     end
 
@@ -126,10 +123,10 @@ class Eye::Checker
       end
     end
 
-    info { "#{last_human_values} => #{result ? 'OK' : 'Fail'}" }
+    info "#{last_human_values} => #{result ? 'OK' : 'Fail'}"
     result
 
-  rescue Object => ex
+  rescue Exception, Timeout::Error => ex
     log_ex(ex)
   end
 
@@ -192,12 +189,7 @@ class Eye::Checker
     process.notify :warn, "Bounded #{check_name}: #{last_human_values} send to #{actions}"
 
     actions.each do |action|
-      reason = Eye::Reason.new("bounded #{check_name}")
-      if action.is_a?(Proc)
-        process.schedule :execute_proc, reason, &action
-      else
-        process.schedule action, reason
-      end
+      process.schedule action, Eye::Reason.new("bounded #{check_name}")
     end
   end
 
@@ -206,11 +198,9 @@ class Eye::Checker
   end
 
   class Defer < Eye::Checker
-
     def get_value_safe
-      Celluloid::Future.new { get_value }.value
+      Celluloid::Future.new{ get_value }.value
     end
-
   end
 
   def self.register(base)
@@ -224,34 +214,27 @@ class Eye::Checker
   end
 
   class CustomCell < Eye::Checker
-
     def self.inherited(base)
       super
       register(base)
     end
-
   end
 
   class Custom < Defer
-
     def self.inherited(base)
       super
       register(base)
     end
-
   end
 
   class CustomDefer < Defer
-
     def self.inherited(base)
       super
       register(base)
     end
-
   end
 
   class Measure < Eye::Checker
-
     param :below, [Fixnum, Float]
     param :above, [Fixnum, Float]
 
@@ -272,7 +255,5 @@ class Eye::Checker
         '-'
       end
     end
-
   end
-
 end

data/lib/eye/checker/children_count.rb

@@ -32,7 +32,7 @@ private
 
   def ordered_by_date_children_pids
     children = process.children.values
-    children.sort_by { |ch| Eye::SystemResources.start_time(ch.pid).to_i }.map(&:pid)
+    children.sort_by { |ch| Eye::SystemResources.start_time(ch.pid).to_i }.map &:pid
   end
 
 end

data/lib/eye/checker/file_ctime.rb

@@ -15,7 +15,7 @@ class Eye::Checker::FileCTime < Eye::Checker
   end
 
   def human_value(value)
-    if value.nil?
+    if value == nil
       'Err'
     else
       value.strftime('%H:%M')

data/lib/eye/checker/http.rb

@@ -21,43 +21,46 @@ class Eye::Checker::Http < Eye::Checker::Defer
     @uri = URI.parse(url)
     @proxy_uri = URI.parse(proxy_url) if proxy_url
     @kind = case kind
-      when Fixnum then Net::HTTPResponse::CODE_TO_OBJ[kind.to_s]
-      when String, Symbol then Net.const_get("HTTP#{kind.to_s.camelize}") rescue Net::HTTPSuccess
-      else Net::HTTPSuccess
-    end
+              when Fixnum then Net::HTTPResponse::CODE_TO_OBJ[kind.to_s]
+              when String, Symbol then Net.const_get("HTTP#{kind.to_s.camelize}") rescue Net::HTTPSuccess
+              else Net::HTTPSuccess
+            end
     @open_timeout = (open_timeout || 3).to_f
     @read_timeout = (read_timeout || timeout || 15).to_f
   end
 
   def get_value
-    res = session.start { |http| http.get(@uri.request_uri) }
-    { result: res }
+    res = session.start{ |http| http.get(@uri.request_uri) }
+    {:result => res}
 
   rescue Timeout::Error => ex
     debug { ex.inspect }
 
     if defined?(Net::OpenTimeout) # for ruby 2.0
       mes = ex.is_a?(Net::OpenTimeout) ? "OpenTimeout<#{@open_timeout}>" : "ReadTimeout<#{@read_timeout}>"
-      { exception: mes }
+      {:exception => mes}
     else
-      { exception: "Timeout<#{@open_timeout},#{@read_timeout}>" }
+      {:exception => "Timeout<#{@open_timeout},#{@read_timeout}>"}
     end
 
   rescue => ex
-    { exception: "Error<#{ex.message}>" }
+    {:exception => "Error<#{ex.message}>"}
   end
 
   def good?(value)
     return false unless value[:result]
-    return false unless value[:result].is_a?(@kind)
+
+    unless value[:result].kind_of?(@kind)
+      return false
+    end
 
     if pattern
       matched = if pattern.is_a?(Regexp)
-        !!value[:result].body.match(pattern)
+        pattern === value[:result].body
       else
         value[:result].body.include?(pattern.to_s)
       end
-      value[:notice] = "missing '#{pattern}'" unless matched
+      value[:notice] = "missing '#{pattern.to_s}'" unless matched
       matched
     else
       true
@@ -99,5 +102,4 @@ private
       Net::HTTP.new(@uri.host, @uri.port)
     end
   end
-
 end

data/lib/eye/checker/nop.rb

@@ -3,5 +3,4 @@ class Eye::Checker::Nop < Eye::Checker
   # check :nop, :every => 10.hours # means restart every 10 hours
 
   def get_value; end
-
 end

data/lib/eye/checker/socket.rb

@@ -27,75 +27,78 @@ class Eye::Checker::Socket < Eye::Checker::Defer
 
     if addr =~ %r[\Atcp://(.*?):(.*?)\z]
       @socket_family = :tcp
-      @socket_addr = Regexp.last_match(1)
-      @socket_port = Regexp.last_match(2).to_i
+      @socket_addr = $1
+      @socket_port = $2.to_i
     elsif addr =~ %r[\Aunix:(.*)\z]
       @socket_family = :unix
-      @socket_path = Regexp.last_match(1)
+      @socket_path = $1
     end
   end
 
   def get_value
     sock = begin
-      Timeout.timeout(@open_timeout) { open_socket }
+      Timeout::timeout(@open_timeout){ open_socket }
     rescue Timeout::Error
-      return { exception: "OpenTimeout<#{@open_timeout}>" }
+      return { :exception => "OpenTimeout<#{@open_timeout}>" }
     end
 
-    return { result: :listen } unless send_data
+    if send_data
+      begin
+        Timeout::timeout(@read_timeout) do
+          _write_data(sock, send_data)
+          result = _read_data(sock)
 
-    begin
-      Timeout.timeout(@read_timeout) do
-        _write_data(sock, send_data)
-        result = _read_data(sock)
-
-        { result: result }
-      end
-    rescue Timeout::Error
-      if protocol == :raw
-        return { result: @buffer }
-      else
-        return { exception: "ReadTimeout<#{@read_timeout}>" }
+          { :result => result }
+        end
+      rescue Timeout::Error
+        if protocol == :raw
+          return { :result => @buffer }
+        else
+          return { :exception => "ReadTimeout<#{@read_timeout}>" }
+        end
       end
+    else
+      { :result => :listen }
     end
 
   rescue Exception => e
-    { exception: "Error<#{e.message}>" }
+    { :exception => "Error<#{e.message}>" }
 
   ensure
     sock.close if sock
   end
 
   def good?(value)
-    return false unless value[:result]
-
-    return true unless expect_data
-
-    if expect_data.is_a?(Proc)
-      match = begin
-        !!expect_data[value[:result]]
-      rescue Object => ex
-        mes = "proc match failed with '#{ex.message}'"
-        error(mes)
-        value[:notice] = mes
-        return false
-      end
+    return false if !value[:result]
+
+    if expect_data
+      if expect_data.is_a?(Proc)
+        match = begin
+          !!expect_data[value[:result]]
+        rescue Timeout::Error, Exception => ex
+          mes = "proc match failed with '#{ex.message}'"
+          error(mes)
+          value[:notice] = mes
+          return false
+        end
 
-      unless match
-        warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer"
-        value[:notice] = 'missing proc validation'
-      end
+        unless match
+          warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer"
+          value[:notice] = 'missing proc validation'
+        end
 
-      return match
-    end
+        return match
+      end
 
-    return true if expect_data.is_a?(Regexp) && expect_data.match(value[:result])
-    return true if value[:result].to_s == expect_data.to_s
+      return true if expect_data.is_a?(Regexp) && expect_data.match(value[:result])
+      return true if value[:result].to_s == expect_data.to_s
 
-    warn "#{expect_data} not matched (#{value[:result].truncate(30)}) answer"
-    value[:notice] = "missing '#{expect_data}'"
+      warn "#{expect_data} not matched (#{value[:result].truncate(30)}) answer"
+      value[:notice] = "missing '#{expect_data.to_s}'"
+      return false
+    end
 
-    false
+    return true
   end
 
   def human_value(value)
@@ -128,28 +131,28 @@ private
 
   def _write_data(socket, data)
     case protocol
-      when :em_object
-        data = Marshal.dump(data)
-        socket.write([data.bytesize, data].pack('Na*'))
-      else
-        socket.write(data.to_s)
+    when :em_object
+      data = Marshal.dump(data)
+      socket.write([data.bytesize, data].pack('Na*'))
+    else
+      socket.write(data.to_s)
     end
   end
 
   def _read_data(socket)
     case protocol
-      when :em_object
-        content = ''
-        msg_size = socket.recv(4).unpack('N')[0] rescue 0
-        content << socket.recv(msg_size - content.length) while content.length < msg_size
-        if content.present?
-          Marshal.load(content) rescue 'corrupted_marshal'
-        end
-      when :raw
-        @buffer = ''
-        loop { @buffer << socket.recv(1) }
-      else
-        socket.readline.chop
+    when :em_object
+      content = ''
+      msg_size = socket.recv(4).unpack('N')[0] rescue 0
+      content << socket.recv(msg_size - content.length) while content.length < msg_size
+      if content.present?
+        Marshal.load(content) rescue 'corrupted_marshal'
+      end
+    when :raw
+      @buffer = ''
+      loop { @buffer << socket.recv(1) }
+    else
+      socket.readline.chop
     end
   end