eye 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1592106a2ce3c26da8ad55f6b0036b10e5932fc
-  data.tar.gz: ff73a4ae40c4eeef57e9c50df0e50e8220eb187f
+  metadata.gz: ec5135b6c531e9451f98ec8b9d36a54d2e57e3f9
+  data.tar.gz: fd8011e705ee96d0d24dffbe03be598a18b285c4
 SHA512:
-  metadata.gz: b81127c859a0e48c6a08b7109582cddcdb12731b93eca191ae3fe65289703075e32c53f3552db24fcca3d693e61ada93ca7bfcae1bed4488724c54918ed6c880
-  data.tar.gz: 22e769a89a91343374045e502404f2fa26002f9a641807d4f772354774a3f88837cf486afb18da4880738548d9b8522f0c865e2b9c8ed2ae6cc9757d3da1ea78
+  metadata.gz: 59237be9adb524bdc90ddb9203d3246e7e6fc03f4b9c7398df2380fba2423e68592a996ac720ff04cd8a813b34ed8a27a1c259421907dd1103b18ad508c9decd
+  data.tar.gz: b741a332f8888e3f5a2dd50af91e0dbafebed8f8dcc406f9f8cab270b565f3ce2624adef2e4b9c2b3be0a01ff18dcbaf28159d4ba55b6d532e37711b8c9fa5cd

data/README.md

@@ -14,26 +14,31 @@ Config example, shows some typical processes and most of the options (see in exa
 
 examples/test.eye
 ```ruby
-Eye.load("./eye/*.rb") # load submodules
+# load submodules, here just for example
+Eye.load("./eye/*.rb") 
 
+# Eye self-configuration section
 Eye.config do
-  logger "/tmp/eye.log" # eye logger
-  logger_level Logger::DEBUG
+  logger "/tmp/eye.log"
 end
 
+# Adding application
 Eye.application "test" do
+  # All options inherits down to the config leafs.
+  # except `env`, which merging down
+
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   stdall "trash.log" # stdout,err logs for processes by default
   env "APP_ENV" => "production" # global env for each processes
-  triggers :flapping, :times => 10, :within => 1.minute
+  triggers :flapping, :times => 10, :within => 1.minute # 
+  checks :cpu, :below => 100, :times => 3 # global check for all processes
 
   group "samples" do
-    env "A" => "1" # merging to app env 
-    chain :grace => 5.seconds, :action => :restart # restarting with 5s interval, one by one.
+    chain :grace => 5.seconds # chained start-restart with 5s interval, one by one.
 
     # eye daemonized process
-    process("sample1") do
-      pid_file "1.pid" # will be expanded with working_dir
+    process :sample1 do
+      pid_file "1.pid" # pid_path will be expanded with the working_dir
       start_command "ruby ./sample.rb"
       daemonize true
       stdall "sample1.log"
@@ -42,7 +47,7 @@ Eye.application "test" do
     end
 
     # self daemonized process
-    process("sample2") do
+    process :sample2 do
       pid_file "2.pid"
       start_command "ruby ./sample.rb -d --pid 2.pid --log sample2.log"
       stop_command "kill -9 {PID}"
@@ -52,7 +57,7 @@ Eye.application "test" do
   end
 
   # daemon with 3 childs
-  process("forking") do
+  process :forking do
     pid_file "forking.pid"
     start_command "ruby ./forking.rb start"
     stop_command "ruby forking.rb stop"
@@ -67,17 +72,19 @@ Eye.application "test" do
     end
   end
   
+  # eventmachine process, daemonized with eye
   process :event_machine do |p|
-    p.pid_file        = 'em.pid'
-    p.start_command   = 'ruby em.rb'
-    p.stdout          = 'em.log'
-    p.daemonize       = true
-    p.stop_signals    = [:QUIT, 2.seconds, :KILL]
+    pid_file 'em.pid'
+    start_command 'ruby em.rb'
+    stdout 'em.log'
+    daemonize true
+    stop_signals [:QUIT, 2.seconds, :KILL]
     
-    p.checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
-                      :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
+    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+                    :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
   end
 
+  # thin process, self daemonized
   process :thin do
     pid_file "thin.pid"
     start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"

data/bin/eye

@@ -78,6 +78,11 @@ class Cli < Thor
     send_command(:signal, sig, *targets)
   end
 
+  desc "break TARGET[,...]", "break group chain executing"
+  def break(*targets)
+    send_command(:break_chain, *targets)
+  end
+
   desc "trace [TARGET]", "tracing log for app,group or process"
   def trace(target = "")
     log_trace(target)

data/examples/notify.eye

@@ -0,0 +1,18 @@
+# Notify example
+
+Eye.config do
+  mail :host => "mx.some.host", :port => 25, :domain => "some.host"
+  contact :errors, :mail, 'error@some.host'
+  contact :dev, :mail, 'dev@some.host'
+end
+
+Eye.application :some do
+  notify :errors
+
+  process :some_process do
+    notify :dev, :warn
+
+    ...
+  end
+
+end

data/examples/process_thin.rb

@@ -0,0 +1,29 @@
+
+def thin(proxy, port)
+  name = "thin-#{port}"
+
+  opts = [
+    "-l thins.log",
+    "-p #{port}",
+    "-P #{name}.pid",
+    "-d",
+    "-R thin.ru",
+    "--tag #{proxy.app.name}.#{proxy.name}",
+    "-t 60",
+    "-e #{proxy.env["RAILS_ENV"]}",
+    "-c #{proxy.working_dir}",
+    "-a 127.0.0.1"
+  ]
+
+  proxy.process(name) do
+    pid_file "#{name}.pid"
+
+    start_command "#{BUNDLE} exec thin start #{opts * ' '}"
+    stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
+
+    stdall "thin.stdall.log"
+
+    checks :http, :url => "http://127.0.0.1:#{port}/hello", :pattern => /World/, 
+                  :every => 5.seconds, :times => [2, 3], :timeout => 1.second
+  end
+end

data/examples/sidekiq.eye

@@ -1,6 +1,10 @@
+# Example: how to run sidekiq daemon
+
 def sidekiq_process(proxy, name)
+  rails_env = proxy.env['RAILS_ENV']
+
   proxy.process(name) do
-    start_command "ruby ./bin/sidekiq -e #{proxy.env['RAILS_ENV']} -C ./config/sidekiq.#{proxy.env['RAILS_ENV']}.yml"
+    start_command "ruby ./bin/sidekiq -e #{rails_env} -C ./config/sidekiq.#{rails_env}.yml"
     pid_file "tmp/pids/#{name}.pid"
     stdall "log/#{name}.log"
     daemonize true

data/examples/test.eye

@@ -1,23 +1,28 @@
-Eye.load("./eye/*.rb") # load submodules
+# load submodules, here just for example
+Eye.load("./eye/*.rb") 
 
+# Eye self-configuration section
 Eye.config do
-  logger "/tmp/eye.log" # eye logger
-  logger_level Logger::DEBUG
+  logger "/tmp/eye.log"
 end
 
+# Adding application
 Eye.application "test" do
+  # All options inherits down to the config leafs.
+  # except `env`, which merging down
+
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   stdall "trash.log" # stdout,err logs for processes by default
   env "APP_ENV" => "production" # global env for each processes
-  triggers :flapping, :times => 10, :within => 1.minute
+  triggers :flapping, :times => 10, :within => 1.minute # 
+  checks :cpu, :below => 100, :times => 3 # global check for all processes
 
   group "samples" do
-    env "A" => "1" # merging to app env 
-    chain :grace => 5.seconds, :action => :restart # restarting with 5s interval, one by one.
+    chain :grace => 5.seconds # chained start-restart with 5s interval, one by one.
 
     # eye daemonized process
-    process("sample1") do
-      pid_file "1.pid" # will be expanded with working_dir
+    process :sample1 do
+      pid_file "1.pid" # pid_path will be expanded with the working_dir
       start_command "ruby ./sample.rb"
       daemonize true
       stdall "sample1.log"
@@ -26,7 +31,7 @@ Eye.application "test" do
     end
 
     # self daemonized process
-    process("sample2") do
+    process :sample2 do
       pid_file "2.pid"
       start_command "ruby ./sample.rb -d --pid 2.pid --log sample2.log"
       stop_command "kill -9 {PID}"
@@ -36,7 +41,7 @@ Eye.application "test" do
   end
 
   # daemon with 3 childs
-  process("forking") do
+  process :forking do
     pid_file "forking.pid"
     start_command "ruby ./forking.rb start"
     stop_command "ruby forking.rb stop"
@@ -51,17 +56,19 @@ Eye.application "test" do
     end
   end
   
+  # eventmachine process, daemonized with eye
   process :event_machine do |p|
-    p.pid_file        = 'em.pid'
-    p.start_command   = 'ruby em.rb'
-    p.stdout          = 'em.log'
-    p.daemonize       = true
-    p.stop_signals    = [:QUIT, 2.seconds, :KILL]
+    pid_file 'em.pid'
+    start_command 'ruby em.rb'
+    stdout 'em.log'
+    daemonize true
+    stop_signals [:QUIT, 2.seconds, :KILL]
     
-    p.checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
-                      :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
+    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+                    :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
   end
 
+  # thin process, self daemonized
   process :thin do
     pid_file "thin.pid"
     start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"

data/examples/thin-farm.eye

@@ -0,0 +1,29 @@
+RUBY = 'ruby'
+BUNDLE = 'bundle'
+
+Eye.load("process_thin.rb")
+
+Eye.config do
+  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"
+
+  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
+  checks :memory, :below => 60.megabytes, :every => 30.seconds, :times => 5
+
+  group :web do
+    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/unicorn.eye

@@ -1,3 +1,5 @@
+# Example: now to run unicorn, and monitor its childs processes
+
 RUBY = '/usr/local/ruby/1.9.3/bin/ruby' # ruby on the server
 RAILS_ENV = 'production'
 

data/eye.gemspec

@@ -32,7 +32,7 @@ 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'
+  gem.add_development_dependency 'eventmachine', ">= 1.0.3"
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.2.1"
+  VERSION   = "0.2.2"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
 
   autoload :Process,        'eye/process'

data/lib/eye/checker.rb

@@ -1,8 +1,6 @@
 class Eye::Checker
   include Eye::Logger::Helpers
 
-  autoload :Validation, 'eye/checker/validation'
-
   autoload :Memory,     'eye/checker/memory'
   autoload :Cpu,        'eye/checker/cpu'
   autoload :Http,       'eye/checker/http'
@@ -51,7 +49,6 @@ class Eye::Checker
   end
 
   def check
-    tm1 = Time.now
     @value = get_value
     @values << {:value => @value, :good => good?(value)}
 
@@ -62,7 +59,7 @@ class Eye::Checker
       result = false if bad_count >= min_tries
     end
 
-    info "#{last_human_values} => #{result ? 'OK' : 'Fail'} (#{Time.now - tm1}s)"
+    info "#{last_human_values} => #{result ? 'OK' : 'Fail'}"
     result
   end
 
@@ -112,8 +109,9 @@ class Eye::Checker
     @values[-1][:value] if @values.present?
   end
 
-  extend Eye::Checker::Validation
+  extend Eye::Dsl::Validation
   param :every, [Fixnum, Float], false, 5
   param :times, [Fixnum, Array]
+  param :fire, Symbol, nil, nil, [:stop, :restart, :unmonitor, :nothing]
 
 end

data/lib/eye/checker/http.rb

@@ -38,8 +38,7 @@ class Eye::Checker::Http < Eye::Checker
   end
 
   def get_value_sync
-    _session = session
-    res = _session.start{ |http| http.get(@uri.path) }
+    res = session.start{ |http| http.get(@uri.request_uri) }
     {:result => res}
 
   rescue Timeout::Error => ex

data/lib/eye/checker/socket.rb

@@ -5,7 +5,7 @@ class Eye::Checker::Socket < Eye::Checker
   #
   # Available parameters:
   # :addr          the socket addr to open. The format is tcp://<host>:<port> or unix:<path>
-  # :timeout       generic timeout for opening the socket or reading data
+  # :timeout       generic timeout for reading data from socket
   # :open_timeout  override generic timeout for the connection
   # :read_timeout  override generic timeout for data read/write
   # :send_data     after connection send this data
@@ -18,7 +18,7 @@ class Eye::Checker::Socket < Eye::Checker
   param :read_timeout,  [Fixnum, Float]
   param :send_data
   param :expect_data,   [String, Regexp, Proc]
-  param :protocol,      [Symbol]
+  param :protocol,      [Symbol], nil, nil, [:default, :em_object]
 
   def check_name
     'socket'

data/lib/eye/controller/commands.rb

@@ -14,6 +14,8 @@ module Eye::Controller::Commands
         exclusive{ send_command(cmd, *args) }
       when :signal
         signal(*args)
+      when :break_chain
+        break_chain(*args)
       when :load
         exclusive{ load(*args) }
       when :info

data/lib/eye/controller/send_command.rb

@@ -21,6 +21,12 @@ module Eye::Controller::SendCommand
     end
   end
 
+  def break_chain(*obj_strs)
+    matched_objects(*obj_strs) do |obj|
+      obj.send_command(:break_chain)
+    end
+  end
+
 private
 
   def matched_objects(*obj_strs, &block)
@@ -60,7 +66,7 @@ private
   # nil if not found
   def find_objects(*obj_strs)
     return [] if obj_strs.blank?
-    return @applications if obj_strs.size == 1 && obj_strs[0].strip == 'all'
+    return @applications.dup if obj_strs.size == 1 && (obj_strs[0].strip == 'all' || obj_strs[0].strip == '*')
 
     res = obj_strs.map{|c| c.split(",").map{|mask| find_objects_by_mask(mask) }}.flatten
 
@@ -76,7 +82,7 @@ private
       res = final
     end
 
-    res.present? ? Eye::Utils::AliveArray.new(res) : res
+    res.present? ? Eye::Utils::AliveArray.new(res) : []
   end
 
   def find_objects_by_mask(mask)

data/lib/eye/dsl.rb

@@ -14,6 +14,7 @@ class Eye::Dsl
   autoload :Validate,             'eye/dsl/validate'
   autoload :Chain,                'eye/dsl/chain'
   autoload :ConfigOpts,           'eye/dsl/config_opts'
+  autoload :Validation,           'eye/dsl/validation'
 
   class Error < Exception; end
   extend Eye::Dsl::Validate

data/lib/eye/dsl/opts.rb

@@ -97,8 +97,42 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     h.instance_eval(&block)
     groups = h.config.delete :groups
     processes = h.config.delete :processes
-    self.config[:groups].merge!(groups) if groups.present?
-    self.config[:processes].merge!(processes) if processes.present?
+
+    if groups.present?
+      config[:groups] ||= {}
+      config[:groups].merge!(groups)
+    end
+
+    if processes.present?
+      config[:processes] ||= {}
+      config[:processes].merge!(processes)
+    end
+  end
+
+  # execute part of config on particular server
+  # array of strings
+  # regexp
+  # string
+  def with_server(glob = nil, &block)
+    on_server = true
+
+    if glob.present? 
+      host = Eye::System.host
+
+      if glob.is_a?(Array)
+        on_server = !!glob.any?{|elem| elem == host}
+      elsif glob.is_a?(Regexp)
+        on_server = !!host.match(glob)
+      elsif glob.is_a?(String) || glob.is_a?(Symbol)
+        on_server = (host == glob.to_s)
+      end
+    end
+
+    scoped do
+      with_condition(on_server, &block)
+    end
+
+    on_server
   end
 
 end