eye 0.8.pre2 → 0.8.rc

data/examples/syslog.eye

@@ -7,7 +7,7 @@ end
 
 Eye.app :syslog_test do
   process :some do
-    pid_file "/tmp/syslog_test.pid"
+    pid_file '/tmp/syslog_test.pid'
     start_command "ruby -e 'loop { p Time.now; sleep 1 }'"
     daemonize!
     stdall syslog

data/examples/test.eye

@@ -66,7 +66,7 @@ Eye.application 'test' do
   end
 
   # eventmachine process, daemonized with eye
-  process :event_machine do |p|
+  process :event_machine do
     pid_file 'em.pid'
     start_command 'ruby em.rb'
     stdout 'em.log'
@@ -86,5 +86,4 @@ Eye.application 'test' do
     check :http, url: 'http://127.0.0.1:33233/hello', pattern: /World/,
                  every: 5.seconds, times: [2, 3], timeout: 1.second
   end
-
 end

data/examples/thin-farm.eye

@@ -1,30 +1,29 @@
 RUBY = 'ruby'
 BUNDLE = 'bundle'
 
-Eye.load("process_thin.rb")
+Eye.load('process_thin.rb')
 
 Eye.config do
-  logger "/tmp/eye.log"
+  logger '/tmp/eye.log'
 end
 
 Eye.app 'thin-farm' do
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
-  env "RAILS_ENV" => "production"
+  env 'RAILS_ENV' => 'production'
 
   # more about stop_on_delete: https://github.com/kostya/eye/wiki/About-stop_on_delete-=-true
   stop_on_delete true
 
-  trigger :flapping, :times => 10, :within => 1.minute
-  check :memory, :below => 60.megabytes, :every => 30.seconds, :times => 5
+  trigger :flapping, times: 10, within: 1.minute
+  check :memory, below: 60.megabytes, every: 30.seconds, times: 5
   start_timeout 30.seconds
 
   group :web do
-    chain :action => :restart, :grace => 5.seconds
-    chain :action => :start, :grace => 0.2.seconds
+    chain action: :restart, grace: 5.seconds
+    chain action: :start, grace: 0.2.seconds
 
     (5555..5560).each do |port|
       thin self, port
     end
   end
-
 end

data/examples/triggers.eye

@@ -5,15 +5,14 @@
 # process.execute_sync(cmd, opts)
 
 Eye.config do
-  logger "/tmp/eye.log"
+  logger '/tmp/eye.log'
 end
 
 Eye.app :triggers do
-
   # Execute shell command before process start
   process :a do
-    pid_file "/tmp/a.pid"
-    start_command "sleep 100"
+    pid_file '/tmp/a.pid'
+    start_command 'sleep 100'
     daemonize true
 
     # send message async which sendxmpp, before process start
@@ -24,41 +23,40 @@ Eye.app :triggers do
 
   # Touch some file before process start, remove file after process die
   process :b do
-    pid_file "/tmp/b.pid"
-    start_command "sleep 100"
+    pid_file '/tmp/b.pid'
+    start_command 'sleep 100'
     daemonize true
 
     # before process starting, touch some file
     trigger :transition1, to: :starting, do: -> {
-      process.execute_sync "touch /tmp/bla.file"
+      process.execute_sync 'touch /tmp/bla.file'
     }
 
     # after process, crashed, or stopped, remove that file
     trigger :transition2, to: :down, do: -> {
-      process.execute_sync "rm /tmp/bla.file"
+      process.execute_sync 'rm /tmp/bla.file'
     }
   end
 
   # With restart :c process, send restart to process :a
   process :c do
-    pid_file "/tmp/c.pid"
-    start_command "sleep 100"
+    pid_file '/tmp/c.pid'
+    start_command 'sleep 100'
     daemonize true
 
     app_name = app.name
-    trigger :transition, :event => :restarting, :do => ->{
-      info "send restarting to :a"
+    trigger :transition, event: :restarting, do: ->{
+      info 'send restarting to :a'
       Eye::Control.command('restart', "#{app_name}:a")
     }
   end
 
   # process d cant start, until file /tmp/bla contains string 'bla'
   process :d do
-    pid_file "/tmp/d.pid"
-    start_command "sleep 100"
+    pid_file '/tmp/d.pid'
+    start_command 'sleep 100'
     daemonize true
 
     trigger :starting_guard, every: 5.seconds, should: -> { `cat /tmp/bla` =~ /bla/ }
   end
-
 end

data/examples/unicorn.eye

@@ -3,37 +3,36 @@
 RUBY = '/usr/local/ruby/1.9.3/bin/ruby' # ruby on the server
 RAILS_ENV = 'production'
 
-Eye.application "rails_unicorn" do
-  env "RAILS_ENV" => RAILS_ENV
+Eye.application 'rails_unicorn' do
+  env 'RAILS_ENV' => RAILS_ENV
 
   # unicorn requires to be `ruby` in path (for soft restart)
-  env "PATH" => "#{File.dirname(RUBY)}:#{ENV['PATH']}"
+  env 'PATH' => "#{File.dirname(RUBY)}:#{ENV['PATH']}"
 
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
 
-  process("unicorn") do
-    pid_file "tmp/pids/unicorn.pid"
+  process('unicorn') do
+    pid_file 'tmp/pids/unicorn.pid'
     start_command "#{RUBY} ./bin/unicorn -Dc ./config/unicorn.rb -E #{RAILS_ENV}"
-    stdall "log/unicorn.log"
+    stdall 'log/unicorn.log'
 
     # stop signals:
     # http://unicorn.bogomips.org/SIGNALS.html
     stop_signals [:TERM, 10.seconds]
 
     # soft restart
-    restart_command "kill -USR2 {PID}"
+    restart_command 'kill -USR2 {PID}'
 
-    check :cpu, :every => 30, :below => 80, :times => 3
-    check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+    check :cpu, every: 30, below: 80, times: 3
+    check :memory, every: 30, below: 150.megabytes, times: [3, 5]
 
     start_timeout 100.seconds
     restart_grace 30.seconds
 
     monitor_children do
-      stop_command "kill -QUIT {PID}"
-      check :cpu, :every => 30, :below => 80, :times => 3
-      check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+      stop_command 'kill -QUIT {PID}'
+      check :cpu, every: 30, below: 80, times: 3
+      check :memory, every: 30, below: 150.megabytes, times: [3, 5]
     end
   end
-
 end

data/eye.gemspec

@@ -1,20 +1,20 @@
 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 = \
-    %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"
+    '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'
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   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,13 +31,15 @@ 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.pre2"
+  VERSION   = '0.8.rc'
   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,7 +21,6 @@ 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,13 +21,12 @@ class Eye::Application
     @groups << group
   end
 
-  # sort processes in name order
   def resort_groups
-    @groups = @groups.sort { |a, b| a.hidden ? 1 : (b.hidden ? -1 : (a.name <=> b.name)) }
+    @groups.sort! # used group method <=> to compare
   end
 
-  def status_data(debug = false)
-    h = { name: @name, type: :application, subtree: @groups.map{|gr| gr.status_data(debug) }}
+  def status_data(opts = {})
+    h = { name: @name, type: :application, subtree: @groups.map { |gr| gr.status_data(opts) } }
     h[:debug] = debug_data if debug
     h
   end
@@ -53,13 +52,13 @@ class Eye::Application
 
   def sub_object?(obj)
     res = @groups.include?(obj)
-    res = @groups.any?{|gr| gr.sub_object?(obj)} if !res
+    res = @groups.any? { |gr| gr.sub_object?(obj) } unless 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,4 +1,5 @@
 class Eye::Checker
+
   include Eye::Dsl::Validation
 
   autoload :Memory,     'eye/checker/memory'
@@ -6,35 +7,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], nil, nil, [:stop, :restart, :unmonitor, :start, :delete, :nothing, :notify]
+  param :fires, [Symbol, Array, Proc], 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 =~ /\A(.*?)_?[0-9]+\z/
-      ctype = $1.to_sym
-      return {:name => type, :type => ctype} if TYPES[ctype]
+    if type =~ %r[\A(.*?)_?[0-9]+\z]
+      ctype = Regexp.last_match(1).to_sym
+      return { name: type, type: ctype } if TYPES[ctype]
     end
   end
 
@@ -50,7 +51,7 @@ class Eye::Checker
   def self.create(pid, options = {}, process = nil)
     get_class(options[:type]).new(pid, options, process)
 
-  rescue Exception, Timeout::Error => ex
+  rescue Object => ex
     log_ex(ex)
     nil
   end
@@ -79,11 +80,11 @@ class Eye::Checker
   end
 
   def logger_tag
-    @process.logger.prefix if @process
+    @logger_tag ||= @process ? @process.logger.prefix : nil
   end
 
   def logger_sub_tag
-    "check:#{check_name}"
+    @logger_sub_tag ||= "check:#{check_name}"
   end
 
   def last_human_values
@@ -105,13 +106,13 @@ class Eye::Checker
 
     @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,7 +127,7 @@ class Eye::Checker
     info "#{last_human_values} => #{result ? 'OK' : 'Fail'}"
     result
 
-  rescue Exception, Timeout::Error => ex
+  rescue Object => ex
     log_ex(ex)
   end
 
@@ -189,7 +190,12 @@ class Eye::Checker
     process.notify :warn, "Bounded #{check_name}: #{last_human_values} send to #{actions}"
 
     actions.each do |action|
-      process.schedule action, Eye::Reason.new("bounded #{check_name}")
+      reason = Eye::Reason.new("bounded #{check_name}")
+      if action.is_a?(Proc)
+        process.schedule :execute_proc, reason, &action
+      else
+        process.schedule action, reason
+      end
     end
   end
 
@@ -198,9 +204,11 @@ 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)
@@ -214,27 +222,34 @@ 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]
 
@@ -255,5 +270,7 @@ class Eye::Checker
         '-'
       end
     end
+
   end
+
 end