reel-eye 0.3.1 → 0.3.2

data/.gitignore

@@ -29,4 +29,5 @@ experiments
 *sublime*
 examples/work*.eye
 script
-[0-9].rb
+[0-9].rb
+*.cache

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - "1.9.3"
+script: COVA=1 bundle exec rake

data/CHANGES.md

@@ -0,0 +1,19 @@
+0.3.3.dev
+---------
+
+0.3.2
+---------
+* improve matching targers
+* possibility to add many checkers with the same type per process (ex: checks :http_2, ...)
+* add uid,gid options (only for ruby 2.0)
+
+0.3.1
+-----
+* load multiple configs (folder,...) now not breaks on first error (each config loads separately)
+* load ~/.eyeconfig with first eye load
+* some concurrency fixes
+* custom checker
+
+0.3
+---
+* stable version

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eye.gemspec
 gemspec
+

data/README.md

@@ -1,5 +1,8 @@
-Eye [![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
+Eye
 ===
+[![Gem Version](https://badge.fury.io/rb/eye.png)](http://rubygems.org/gems/eye)
+[![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
+[![Coverage Status](https://coveralls.io/repos/kostya/eye/badge.png?branch=master)](https://coveralls.io/r/kostya/eye?branch=master)
 
 Process monitoring tool. An alternative to God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.
 
@@ -150,6 +153,10 @@ Check config syntax:
 
     $ eye c(heck) examples/test.eye
 
+Config explain (for debug):
+
+    $ eye e(xplain) examples/test.eye
+
 Log tracing:
 
     $ eye trace 
@@ -160,11 +167,6 @@ Quit monitoring:
 
     $ eye q(uit)
 
-Config explain (for debug):
-
-    $ eye explain examples/test.eye
-
-
-### Config api:
+### Config options:
 
-  Waiting for pull requests ..., until that you can read `examples` and `spec/dsl` folders.
+  Waiting for pull requests here..., until that you can read `examples` and `spec/dsl` folders.

data/bin/eye

@@ -10,9 +10,7 @@ class Cli < Thor
 
   desc "info [MASK]", "show process statuses"
   def info(mask = nil)
-    res = cmd(:info, mask)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:info, mask)
   end
 
   desc "status ", "show process statuses"
@@ -25,31 +23,22 @@ class Cli < Thor
   method_option :config, :type => :boolean, :aliases => "-c"
   method_option :show_processes, :type => :boolean, :aliases => "-p"
   def xinfo    
-    res = cmd(:xinfo, options[:config], options[:show_processes])
-    puts res if res && !res.empty?
-    puts
+    print cmd(:xinfo, options[:config], options[:show_processes])
   end
 
   desc "oinfo", "onelined info"
   def oinfo
-    res = cmd(:oinfo)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:oinfo)
   end
 
   desc "load [CONF, ...]", "load config (and start server if needed) (-f for foregraund start)"
   method_option :foregraund, :type => :boolean, :aliases => "-f"
-  method_option :logger, :type => :string, :aliases => "-l"
   def load(*configs)
     configs.map!{ |c| File.expand_path(c) } if !configs.empty?
 
     if options[:foregraund]
       # in foregraund we stop another server, and run just 1 current config version
-      if configs.size != 1
-        say "foregraund expected only one config", :red
-        exit 1
-      end
-
+      error!("foregraund expected only one config") if configs.size != 1
       server_start_foregraund(configs.first)
 
     elsif server_started?
@@ -90,9 +79,7 @@ class Cli < Thor
 
   desc "history TARGET[,...]", "show process states history"
   def history(*targets)
-    res = cmd(:history, *targets)
-    puts res if res && !res.empty?
-    puts
+    print cmd(:history, *targets)
   end
 
   desc "trace [TARGET]", "tracing log for app,group or process"
@@ -146,6 +133,16 @@ class Cli < Thor
 
 private
 
+  def error!(msg)
+    say msg, :red
+    exit 1
+  end
+
+  def print(msg, new_line = true)
+    say msg if msg && !msg.empty?
+    say if new_line
+  end
+
   def client
     @client ||= Eye::Client.new(Eye::Settings.socket_path)
   end
@@ -160,11 +157,9 @@ private
     res = _cmd(cmd, *args)
 
     if res == :not_started
-      say "eye monitoring not found, did you start it?", :red
-      exit 1
+      error! "eye monitoring not found, did you start it?"
     elsif res == :timeouted
-      say "eye does not answer, timeouted...", :red
-      exit 1
+      error! "eye does not answer, timeouted..."
     end
     
     res
@@ -175,18 +170,12 @@ private
   end
   
   def say_load_result(res = {}, opts = {})
-    say(res) unless res.is_a?(Hash)
-
-    if res.has_key?(:error) # TODO: remove that case, outdated
-      show_load_message(res, opts)
-      exit 1 if res[:error]
-    else
-      say_filename = (res.size > 1)
-      say "eye started!", :green if opts[:started]
-      res.each do |filename, _res|
-        say "#{filename}: ", nil, true if say_filename
-        show_load_message(_res, opts)
-      end
+    error!(res) unless res.is_a?(Hash)
+    say_filename = (res.size > 1)
+    say "eye started!", :green if opts[:started]
+    res.each do |filename, _res|
+      say "#{filename}: ", nil, true if say_filename
+      show_load_message(_res, opts)
     end
   end
 
@@ -212,11 +201,11 @@ private
   def send_command(_cmd, *args)
     res = cmd(_cmd, *args)
     if res == :unknown_command
-      say "unknown command :#{_cmd}", :red
+      error! "unknown command :#{_cmd}"
     elsif res == :corrupred_marshal
-      say "something crazy wrong, check eye logs!", :red
+      error! "something crazy wrong, check eye logs!"
     elsif res == []
-      say "command :#{_cmd}, targets not found!", :red
+      error! "command :#{_cmd}, targets not found!"
     else
       say "command :#{_cmd} sended to [#{res * ", "}]"
     end        
@@ -227,7 +216,7 @@ private
     if log_file && File.exists?(log_file)
       Process.exec "tail -n 100 -f #{log_file} | grep '#{tag}'"
     else
-      say "log file not found #{log_file.inspect}", :red
+      error! "log file not found #{log_file.inspect}"
     end
   end
   
@@ -250,8 +239,7 @@ private
 
   def ensure_loader_path
     unless loader_path
-      say "start monitoring needs to run under ruby with installed gem 'eye'", :red
-      exit 1
+      error! "start monitoring needs to run under ruby with installed gem 'eye'"
     end
   end
 
@@ -275,18 +263,15 @@ private
     Eye::Settings.ensure_eye_dir
 
     ensure_stop_previous_server
-    
-    args = []
-    args += ['-l', options[:logger]] if options[:logger]
 
+    args = []
     pid = Process.spawn(ruby_path, loader_path, *args, :out => '/dev/null', :err => '/dev/null', :in => '/dev/null',
                         :chdir => '/', :pgroup => true)
     Process.detach(pid)
     File.open(Eye::Settings.pid_path, 'w'){|f| f.write(pid) }
 
     unless wait_server
-      say "server not runned in 15 seconds, something crazy wrong", :red
-      exit 1
+      error! "server not runned in 15 seconds, something crazy wrong"
     end
 
     configs.unshift(Eye::Settings.eyeconfig) if File.exists?(Eye::Settings.eyeconfig)

data/examples/notify.eye

@@ -11,8 +11,9 @@ Eye.application :some do
 
   process :some_process do
     notify :dev, :info
+    pid_file "1.pid"
 
-    ...
+    #...
   end
 
-end
+end

data/examples/puma.eye

@@ -1,6 +1,6 @@
 RUBY      = '/usr/local/ruby/1.9.3-p392/bin/ruby'
 RAILS_ENV = 'production'
-ROOT      = '/var/www/super_app'
+ROOT      = File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
 CURRENT   = File.expand_path(File.join(ROOT, %w{current}))
 LOGS      = File.expand_path(File.join(ROOT, %w{shared log}))
 PIDS      = File.expand_path(File.join(ROOT, %w{shared pids}))
@@ -12,7 +12,7 @@ end
 
 Eye.application :super_app do
   env 'RAILS_ENV' => RAILS_ENV
-  working_dir CURRENT
+  working_dir ROOT
   triggers :flapping, :times => 10, :within => 1.minute
 
   process :puma do

data/examples/rbenv.eye

@@ -1,6 +1,6 @@
 Eye.application "rbenv_example" do
   env 'RBENV_ROOT' => '/usr/local/rbenv', 'PATH' => "/usr/local/rbenv/shims:/usr/local/rbenv/bin:#{ENV['PATH']}"
-  working_dir "/projects/some_project"
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   
   process "some_process" do
     pid_file "some.pid"
@@ -8,4 +8,4 @@ Eye.application "rbenv_example" do
     daemonize true
     stdall "some.log"
   end
-end
+end

data/examples/sidekiq.eye

@@ -16,8 +16,8 @@ def sidekiq_process(proxy, name)
 end
 
 Eye.application :sidekiq_test do
-  working_dir '/some_dir'
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   env "RAILS_ENV" => 'production'
  
   sidekiq_process self, :sidekiq
-end
+end

data/examples/thin-farm.eye

@@ -16,6 +16,7 @@ Eye.app 'thin-farm' do
 
   triggers :flapping, :times => 10, :within => 1.minute
   checks :memory, :below => 60.megabytes, :every => 30.seconds, :times => 5
+  start_timeout 30.seconds
 
   group :web do
     chain :action => :restart, :grace => 5.seconds

data/examples/unicorn.eye

@@ -5,7 +5,7 @@ RAILS_ENV = 'production'
 
 Eye.application "rails_unicorn" do
   env "RAILS_ENV" => RAILS_ENV, "PATH" => "#{File.dirname(RUBY)}:#{ENV['PATH']}"
-  working_dir "/projects/rails_unicorn"
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   
   process("unicorn") do
     pid_file "tmp/pids/unicorn.pid"

data/eye.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'ruby-graphviz'
   gem.add_development_dependency 'forking'
@@ -39,4 +38,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'
+  gem.add_development_dependency 'coveralls'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.3.1"
+  VERSION   = "0.3.2"
   ABOUT     = "ReelEye v#{VERSION} (c) 2012-2013 @kostya"
   PROCLINE  = "reel-eye monitoring v#{VERSION}"
 

data/lib/eye/application.rb

@@ -50,7 +50,7 @@ class Eye::Application
   end
 
   def send_command(command, *args)
-    debug "send_command #{command} #{args}"
+    info "send_command #{command}"
     
     @groups.each do |group|
       group.send_command(command, *args)

data/lib/eye/checker.rb

@@ -13,6 +13,16 @@ class Eye::Checker
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count
 
+  def self.name_and_class(type)
+    type = type.to_sym
+    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]
+    end   
+  end
+
   def self.get_class(type)
     klass = eval("Eye::Checker::#{TYPES[type]}") rescue nil
     raise "Unknown checker #{type}" unless klass

data/lib/eye/controller/commands.rb

@@ -59,15 +59,10 @@ private
 
   def quit
     info 'exiting...'
-    delete
     sleep 1
     Eye::System.send_signal($$) # soft terminate
     sleep 2
     Eye::System.send_signal($$, 9)
   end
 
-  def delete
-    send_command(:delete)
-  end
-
 end

data/lib/eye/controller/helpers.rb

@@ -6,10 +6,24 @@ module Eye::Controller::Helpers
     $0 = str
   end
 
+  def save_cache
+    File.open(Eye::Settings.cache_path, 'w') { |f| f.write(cache_str) }
+  rescue => ex
+    warn "save cache crashed with #{ex.message}"
+  end
+
+  def cache_str
+    all_processes.map{ |p| "#{p.full_name}=#{p.state}" } * "\n"
+  end
+
   def process_by_name(name)
     all_processes.detect{|c| c.name == name}
   end
 
+  def process_by_full_name(name)
+    all_processes.detect{|c| c.full_name == name }
+  end
+
   def group_by_name(name)
     all_groups.detect{|c| c.name == name}
   end
@@ -58,4 +72,4 @@ module Eye::Controller::Helpers
     res
   end
 
-end
+end

data/lib/eye/controller/load.rb

@@ -22,6 +22,7 @@ module Eye::Controller::Load
     end
 
     set_proc_line
+    save_cache
 
     res
   end
@@ -35,6 +36,8 @@ private
     { :error => false, :config => yield }
 
   rescue Eye::Dsl::Error, Exception, NoMethodError => ex
+    raise if ex.class.to_s.include?('RR') # skip RR exceptions
+
     error "load: config error <#{filename}>: #{ex.message}"
 
     # filter backtrace for user output

data/lib/eye/controller/options.rb

@@ -18,7 +18,7 @@ module Eye::Controller::Options
   def set_opt_http(params = {})
     if params[:enable]
       if @http
-        if params[:host] != @http.host || params[:host].to_i != @http.host
+        if params[:host] != @http.host || params[:port].to_i != @http.port
           stop_http
           start_http(params[:host], params[:port])
         end

data/lib/eye/controller/send_command.rb

@@ -4,7 +4,9 @@ module Eye::Controller::SendCommand
     matched_objects(*obj_strs) do |obj|
       if command.to_sym == :delete
         remove_object_from_tree(obj) 
-        set_proc_line # to sync proc line if was delete application
+
+        set_proc_line
+        save_cache
       end
 
       obj.send_command(command)
@@ -61,32 +63,44 @@ private
     return [] if obj_strs.blank?
     return @applications.dup if obj_strs.size == 1 && (obj_strs[0].strip == 'all' || obj_strs[0].strip == '*')
 
-    res = []
+    res = Eye::Utils::AliveArray.new
     obj_strs.map{|c| c.split(",")}.flatten.each do |mask|
-      res += find_objects_by_mask(mask)
+      res += find_objects_by_mask(mask.to_s.strip)
     end
+    res
+  end
+
+  def find_objects_by_mask(mask)
+    res = find_all_objects_by_mask(mask)
 
     if res.size > 1
-      # remove inherited targets
+      final = Eye::Utils::AliveArray.new
 
-      final = []
+      if mask[-1] != '*'
+        # try to find exactly matched
+        r = right_regexp(mask)
+        res.each do |obj|
+          final << obj if obj.full_name =~ r
+        end
+      end
+
+      return final if final.present?
+
+      # remove inherited targets
       res.each do |obj|
         sub_object = res.any?{|a| a.sub_object?(obj) }
         final << obj unless sub_object
       end
 
       res = final
-    end
+    end    
 
-    res.present? ? Eye::Utils::AliveArray.new(res) : []
+    res
   end
 
-  def find_objects_by_mask(mask)
-    mask.strip!
-
-    res = []
-    str = Regexp.escape(mask).gsub('\*', '.*?')
-    r = %r{\A#{str}}
+  def find_all_objects_by_mask(mask)
+    res = Eye::Utils::AliveArray
+    r = left_regexp(mask)
 
     # find app
     res = @applications.select{|a| a.name =~ r || a.full_name =~ r }
@@ -102,9 +116,16 @@ private
         gr.processes.each do |p|
           res << p if p.name =~ r || p.full_name =~ r
 
+          # child matching
           if p.childs.present?
-            res += p.childs.values.select{|ch| ch.alive? && (ch.name =~ r || ch.full_name =~ r) }
+            childs = p.childs.values
+            res += childs.select do |ch|
+              name = ch.name rescue ''
+              full_name = ch.full_name rescue ''
+              name =~ r || full_name =~ r
+            end
           end
+
         end
       end
     end
@@ -112,4 +133,13 @@ private
     res
   end
 
+  def left_regexp(mask)
+    str = Regexp.escape(mask).gsub('\*', '.*?')
+    %r|\A#{str}|
+  end
+
+  def right_regexp(mask)
+    str = Regexp.escape(mask).gsub('\*', '.*?')
+    %r|#{str}\z|
+  end
 end