reel-eye 0.3.2 → 0.4

data/examples/test.eye

@@ -1,5 +1,5 @@
 # load submodules, here just for example
-Eye.load("./eye/*.rb") 
+Eye.load("./eye/*.rb")
 
 # Eye self-configuration section
 Eye.config do
@@ -24,6 +24,10 @@ Eye.application "test" do
     process :sample1 do
       pid_file "1.pid" # pid_path will be expanded with the working_dir
       start_command "ruby ./sample.rb"
+
+      # when no stop_command or stop_signals, default stop is [:TERM, 0.5, :KILL]
+      # default `restart` command is `stop; start`
+
       daemonize true
       stdall "sample1.log"
 
@@ -49,13 +53,13 @@ Eye.application "test" do
 
     start_timeout 5.seconds
     stop_grace 5.seconds
-  
+
     monitor_children do
       restart_command "kill -2 {PID}" # for this child process
       checks :memory, :below => 300.megabytes, :times => 3
     end
   end
-  
+
   # eventmachine process, daemonized with eye
   process :event_machine do |p|
     pid_file 'em.pid'
@@ -63,8 +67,8 @@ Eye.application "test" do
     stdout 'em.log'
     daemonize true
     stop_signals [:QUIT, 2.seconds, :KILL]
-    
-    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+
+    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2,
                     :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
   end
 
@@ -74,7 +78,7 @@ Eye.application "test" do
     start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"
     stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
 
-    checks :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds, 
+    checks :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds,
                   :times => [2, 3], :timeout => 1.second
   end
 

data/examples/thin-farm.eye

@@ -11,7 +11,7 @@ Eye.app 'thin-farm' do
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   env "RAILS_ENV" => "production"
 
-  stop_on_delete true # this option means, when we change pids and load config, 
+  stop_on_delete true # this option means, when we change pids and load config,
                       # deleted processes will be stops
 
   triggers :flapping, :times => 10, :within => 1.minute

data/examples/unicorn.eye

@@ -6,7 +6,7 @@ RAILS_ENV = 'production'
 Eye.application "rails_unicorn" do
   env "RAILS_ENV" => RAILS_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"
     start_command "#{RUBY} ./bin/unicorn -Dc ./config/unicorn.rb -E #{RAILS_ENV}"

data/eye.gemspec

@@ -17,19 +17,24 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.required_ruby_version     = '>= 1.9.2' # because of celluloid
-  gem.required_rubygems_version = '>= 1.3.6'  
-  
-  gem.add_dependency 'celluloid',     '~> 0.13.0'
-  gem.add_dependency 'celluloid-io',  '~> 0.13.0'
-  gem.add_dependency 'state_machine', '< 1.2'
-  gem.add_dependency 'activesupport', '~> 3.2.0'
+  gem.required_rubygems_version = '>= 1.3.6'
+
+  gem.add_dependency 'celluloid',     '~> 0.14.0'
+  gem.add_dependency 'celluloid-io',  '~> 0.14.0'
+  gem.add_dependency 'state_machine'
   gem.add_dependency 'thor'
 
   gem.add_dependency 'reel',          '~> 0.4.0.pre'
   gem.add_dependency 'cuba'
 
+  if RUBY_VERSION == '1.9.2'
+    gem.add_dependency 'activesupport', '>= 3', '< 4.0'
+  else
+    gem.add_dependency 'activesupport', '>= 3'
+  end
+
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '< 2.14'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'ruby-graphviz'
   gem.add_development_dependency 'forking'
@@ -39,4 +44,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'
   gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'parallel_tests'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
-module Eye  
-  VERSION   = "0.3.2"
+module Eye
+  VERSION   = "0.4"
   ABOUT     = "ReelEye v#{VERSION} (c) 2012-2013 @kostya"
   PROCLINE  = "reel-eye monitoring v#{VERSION}"
 
@@ -8,19 +8,19 @@ 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'
-  autoload :Dsl,            'eye/dsl'  
-  autoload :Application,    'eye/application'  
+  autoload :Dsl,            'eye/dsl'
+  autoload :Application,    'eye/application'
   autoload :Settings,       'eye/settings'
   autoload :Client,         'eye/client'
   autoload :Utils,          'eye/utils'
   autoload :Notify,         'eye/notify'
   autoload :Config,         'eye/config'
   autoload :Reason,         'eye/reason'
-  
+
   autoload :Controller,     'eye/controller'
   autoload :Control,        'eye/control'
 

data/lib/eye/application.rb

@@ -2,16 +2,17 @@ class Eye::Application
 
   attr_reader :groups, :name
 
-  include Eye::Logger::Helpers
-
   def initialize(name, config = {})
     @groups = Eye::Utils::AliveArray.new
     @name = name
-    @logger = Eye::Logger.new(full_name)
     @config = config
     debug 'created'
   end
 
+  def logger_tag
+    full_name
+  end
+
   def full_name
     @name
   end
@@ -37,7 +38,7 @@ class Eye::Application
 
   def status_data_short
     h = Hash.new 0
-    @groups.each do |c| 
+    @groups.each do |c|
       c.processes.each do |p|
         h[p.state] += 1
       end
@@ -51,7 +52,7 @@ class Eye::Application
 
   def send_command(command, *args)
     info "send_command #{command}"
-    
+
     @groups.each do |group|
       group.send_command(command, *args)
     end
@@ -68,7 +69,9 @@ class Eye::Application
   end
 
   def processes
-    Eye::Utils::AliveArray.new(@groups.map{|gr| gr.processes.to_a }.flatten)
+    out = []
+    @groups.each{|gr| out += gr.processes.to_a }
+    Eye::Utils::AliveArray.new(out)
   end
 
 end

data/lib/eye/checker.rb

@@ -1,5 +1,4 @@
 class Eye::Checker
-  include Eye::Logger::Helpers
 
   autoload :Memory,     'eye/checker/memory'
   autoload :Cpu,        'eye/checker/cpu'
@@ -8,10 +7,15 @@ class Eye::Checker
   autoload :FileSize,   'eye/checker/file_size'
   autoload :Socket,     'eye/checker/socket'
 
-  TYPES = {:memory => "Memory", :cpu => "Cpu", :http => "Http", 
+  TYPES = {:memory => "Memory", :cpu => "Cpu", :http => "Http",
            :ctime => "FileCTime", :fsize => "FileSize", :socket => "Socket"}
 
-  attr_accessor :value, :values, :options, :pid, :type, :check_count
+  attr_accessor :value, :values, :options, :pid, :type, :check_count, :process
+
+  extend Eye::Dsl::Validation
+  param :every, [Fixnum, Float], false, 5
+  param :times, [Fixnum, Array], nil, 1
+  param :fire, Symbol, nil, nil, [:stop, :restart, :unmonitor, :nothing]
 
   def self.name_and_class(type)
     type = type.to_sym
@@ -20,7 +24,7 @@ class Eye::Checker
     if type =~ /\A(.*?)_?[0-9]+\z/
       ctype = $1.to_sym
       return {:name => type, :type => ctype} if TYPES[ctype]
-    end   
+    end
   end
 
   def self.get_class(type)
@@ -29,29 +33,41 @@ class Eye::Checker
     klass
   end
 
-  def self.create(pid, options = {}, logger_prefix = nil)
-    get_class(options[:type]).new(pid, options, logger_prefix)
+  def self.create(pid, options = {}, process = nil)
+    get_class(options[:type]).new(pid, options, process)
   end
 
   def self.validate!(options)
     get_class(options[:type]).validate(options)
   end
 
-  def initialize(pid, options = {}, logger_prefix = nil)
+  def initialize(pid, options = {}, process = nil)
+    @process = process
     @pid = pid
     @options = options
     @type = options[:type]
 
-    @logger = Eye::Logger.new(logger_prefix, "check:#{check_name}")
     debug "create checker, with #{options}"
-    
+
     @value = nil
     @values = Eye::Utils::Tail.new(max_tries)
     @check_count = 0
   end
 
+  def inspect
+    "<#{self.class} @process='#{@process.full_name}' @options=#{@options} @pid=#{@pid}>"
+  end
+
+  def logger_tag
+    @process.logger.prefix
+  end
+
+  def logger_sub_tag
+    "check:#{check_name}"
+  end
+
   def last_human_values
-    h_values = @values.map do |v| 
+    h_values = @values.map do |v|
       sign = v[:good] ? '' : '*'
       sign + human_value(v[:value]).to_s
     end
@@ -90,7 +106,7 @@ class Eye::Checker
   # true if check ok
   # false if check bad
   def good?(value)
-    raise 'Realize me'
+    value
   end
 
   def check_name
@@ -106,7 +122,7 @@ class Eye::Checker
       end
     else
       1
-    end    
+    end
   end
 
   def min_tries
@@ -125,10 +141,13 @@ class Eye::Checker
     @values[-1][:value] if @values.present?
   end
 
-  extend Eye::Dsl::Validation
-  param :every, [Fixnum, Float], false, 5
-  param :times, [Fixnum, Array]
-  param :fire, Symbol, nil, nil, [:stop, :restart, :unmonitor, :nothing]
+  def run_in_process_context(p)
+    process.instance_exec(&p) if process.alive?
+  end
+
+  def defer(&block)
+    Celluloid::Future.new(&block).value
+  end
 
   class Defer < Eye::Checker
     def get_value_safe
@@ -136,13 +155,24 @@ class Eye::Checker
     end
   end
 
-  class Custom < Defer
+  def self.register(base)
+    name = base.to_s.gsub("Eye::Checker::", '')
+    type = name.underscore.to_sym
+    Eye::Checker::TYPES[type] = name
+    Eye::Checker.const_set(name, base)
+  end
+
+  class Custom < Eye::Checker
+    def self.inherited(base)
+      super
+      register(base)
+    end
+  end
+
+  class CustomDefer < Defer
     def self.inherited(base)
       super
-      name = base.to_s
-      type = name.underscore.to_sym
-      Eye::Checker::TYPES[type] = name
-      Eye::Checker.const_set(name, base)
+      register(base)
     end
   end
 end

data/lib/eye/checker/file_size.rb

@@ -2,7 +2,7 @@ class Eye::Checker::FileSize < Eye::Checker
 
   # Check that file size changed (log for example)
 
-  # checks :fsize, :every => 5.seconds, :file => "/tmp/1.log", :times => [3,5], 
+  # checks :fsize, :every => 5.seconds, :file => "/tmp/1.log", :times => [3,5],
   #      :below => 30.kilobytes, :above => 10.kilobytes
 
   param :file, [String], true

data/lib/eye/checker/http.rb

@@ -28,7 +28,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     @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}
@@ -52,7 +52,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     return false unless value[:result]
 
     unless value[:result].kind_of?(@kind)
-      return false 
+      return false
     end
 
     if @pattern
@@ -79,7 +79,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
       msg += "<#{value[:notice]}>" if value[:notice]
       msg
     end
-  end  
+  end
 
 private
 

data/lib/eye/checker/memory.rb

@@ -3,7 +3,7 @@ class Eye::Checker::Memory < Eye::Checker
   # checks :memory, :every => 3.seconds, :below => 80.megabytes, :times => [3,5]
 
   param :below, [Fixnum, Float], true
-  
+
   def check_name
     @check_name ||= "memory(#{human_value(below)})"
   end

data/lib/eye/checker/socket.rb

@@ -68,18 +68,18 @@ class Eye::Checker::Socket < Eye::Checker::Defer
     return false if !value[:result]
 
     if expect_data
-      if expect_data.is_a?(Proc)                
+      if expect_data.is_a?(Proc)
         match = begin
-          !!expect_data[value[:result]] 
+          !!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" 
+          warn "proc #{expect_data} not matched (#{value[:result].truncate(30)}) answer"
           value[:notice] = "missing proc validation"
         end
 
@@ -108,7 +108,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
       else
         res = "#{value[:result].to_s.size}b"
         res += "<#{value[:notice]}>" if value[:notice]
-        res 
+        res
       end
     end
   end
@@ -116,7 +116,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
 private
 
   def open_socket
-    if @socket_family == :tcp      
+    if @socket_family == :tcp
       TCPSocket.open(@socket_addr, @socket_port)
     elsif @socket_family == :unix
       UNIXSocket.open(@socket_path)

data/lib/eye/child_process.rb

@@ -15,9 +15,6 @@ class Eye::ChildProcess
   # system methods: send_signal
   include Eye::Process::System
 
-  # logger methods: info, ...
-  include Eye::Logger::Helpers
-
   # self_status_data
   include Eye::Process::Data
 
@@ -37,8 +34,6 @@ class Eye::ChildProcess
     @name = "child-#{pid}"
     @full_name = [logger_prefix, @name] * ':'
 
-    @logger = Eye::Logger.new(@full_name)
-    
     @watchers = {}
 
     debug "start monitoring CHILD config: #{@config.inspect}"
@@ -46,6 +41,10 @@ class Eye::ChildProcess
     start_checkers
   end
 
+  def logger_tag
+    full_name
+  end
+
   def state
     :up
   end
@@ -70,7 +69,7 @@ class Eye::ChildProcess
       execute_restart_command
     else
       stop
-    end    
+    end
   end
 
   def monitor
@@ -79,7 +78,7 @@ class Eye::ChildProcess
   def unmonitor
   end
 
-  def delete 
+  def delete
   end
 
   def destroy
@@ -88,10 +87,7 @@ class Eye::ChildProcess
   end
 
   def signal(sig)
-    if self.pid
-      res = send_signal(sig)
-      info "send signal #{sig} to #{self.pid} = #{res}"
-    end
+    send_signal(sig) if self.pid
   end
 
   def status_data(debug = false)