eye 0.7.pre → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488ed21561da07936dd5fbc3e0d869e4665ba4a5
-  data.tar.gz: 12b6d6c69ee5e0bf9409bb61e700a6525d1d386a
+  metadata.gz: af465bb7737a6f1891bc3ab6ee5d9ebe9547530a
+  data.tar.gz: 929efa8c2932925ef6aa2974377982a16e50494e
 SHA512:
-  metadata.gz: 54a0993fb03ecf29c9f8a572c977aeb6856da53b972f6d3555c1e17fef13bc807fdfb819ed968f4571f5ee3dd05c8faf0cf766a77be6017ac81e007927605438
-  data.tar.gz: 3023586158006d3c76ba25675b88bfc2eb0977cafc748b928437ab1cf74178d4494e229e6028615ae8c1efc667188566b0801f5739fa565a94026e6cd737fb56
+  metadata.gz: 9bb24f0bc0d47d2345aa0a1f708ad76486cfbe72363cdd6b6410133b912fc8cf47bddde0995422272c7688338ca986386ec3e8b4e9234b09d82adcc9dda155a6
+  data.tar.gz: edf8b2a9874f4d58423d501bbe130e75109317be53a05d418118782f127ba5b4637d5109674c1621f21ceb5a04022cbaa6ba8864f2ab34a690c1b1b277798b44

data/.travis.yml

@@ -3,5 +3,5 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.1"
-  - "2.2"
+  - "2.2.2"
 script: bundle exec rake split_test N=15

data/CHANGES.md

@@ -1,10 +1,18 @@
-0.7.pre
+0.7
 -------
-* add trigger starting_guard
+* add `stdall syslog`, example: https://github.com/kostya/eye/blob/master/examples/syslog.eye
+* added check `ssl_socket` #125
+* some fixes with `eye q -s`
+* fixed `__default__` apps
+* default loaded configs with first eye start, is: `/etc/eye.conf`, and `~/.eyeconfig`
+* add trigger `starting_guard`
+* fix `load_env` function
 * fix multiple contacts #118
 * add slack notifier #115
 * some fixes in depend_on
 * some fixes in flapping
+* add proxy_url to http check
+* process with children, shows children history now
 * Update Celluloid to 0.16.0
 
 0.6.4

data/README.md

@@ -43,6 +43,9 @@ Eye.application 'test' do
   # All options inherits down to the config leafs.
   # except `env`, which merging down
 
+  # uid "user_name" # run app as a user_name (optional) - available only on ruby >= 2.0
+  # gid "group_name" # run app as a group_name (optional) - available only on ruby >= 2.0
+
   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
@@ -152,6 +155,8 @@ test
   thin ............................ up  (21:53, 2%, 54Mb, <4228>)
 ```
 
+    $ eye i -j # show info in JSON format
+
 ### Commands:
 
     start, stop, restart, delete, monitor, unmonitor

data/examples/delayed_job.eye

@@ -2,7 +2,7 @@ cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
 
 config_path = File.join(cwd, %w{ config dj.yml } )
 
-workers_count = if File.exists?(config_path)
+workers_count = if File.exist?(config_path)
   YAML.load_file(config_path).try(:[], :workers) || 5
 else
   5

data/examples/dependency.eye

@@ -1,4 +1,4 @@
-# process dependencies :b -> :a
+# process dependencies example
 
 Eye.app :dependency do
   process(:a) do

data/examples/plugin/plugin.rb

@@ -13,7 +13,7 @@ class Reactor
   end
 
   def read_file
-    if File.exists?(@filename)
+    if File.exist?(@filename)
       cmd = File.read(@filename).chop
       File.delete(@filename) rescue nil
       cmd

data/examples/process_thin.rb

@@ -1,3 +1,4 @@
+# part of thin-farm.eye config
 
 def thin(proxy, port)
   name = "thin-#{port}"
@@ -10,7 +11,7 @@ def thin(proxy, port)
     "-R thin.ru",
     "--tag #{proxy.app.name}.#{proxy.name}",
     "-t 60",
-    "-e #{proxy.env["RAILS_ENV"]}",
+    "-e #{proxy.env['RAILS_ENV']}",
     "-c #{proxy.working_dir}",
     "-a 127.0.0.1"
   ]

data/examples/processes/forking.rb

@@ -2,19 +2,23 @@ require 'bundler/setup'
 require 'forking'
 
 root = File.expand_path(File.dirname(__FILE__))
+cnt = (ENV['FORKING_COUNT'] || 3).to_i
 
 f = Forking.new(:name => 'forking', :working_dir => root,
     :log_file => "#{root}/forking.log",
     :pid_file => "#{root}/forking.pid", :sync_log => true)
 
-3.times do |i|
+cnt.times do |i|
   f.spawn(:log_file => "#{root}/child#{i}.log", :sync_log => true) do
     $0 = "forking child"
+    t = 0
     loop do
       p "#{Time.now} - #{Time.now.to_f} - #{i} - tick"
       sleep 0.1
+      t += 0.1
+      exit if t > 300
     end
   end
 end
 
-f.run!
+f.run!

data/examples/processes/sample.rb

@@ -53,7 +53,7 @@ optparse.parse!
 module Sample
   def puts(mes = "")
     tm = Time.now
-    STDOUT.puts "#{tm.to_s} (#{tm.to_f}) - #{mes}"
+    STDOUT.puts "#{tm} (#{tm.to_f}) - #{mes}"
     STDOUT.flush
   end
 
@@ -92,10 +92,10 @@ if options[:daemonize]
   daemonize(options[:pid_file], options[:log_file], options[:daemonize_delay])
 end
 
-puts "Started #{ARGV.inspect}, #{options.inspect}, #{ENV["ENV1"]}"
+puts "Started #{ARGV.inspect}, #{options.inspect}, #{ENV['ENV1']}"
 
 if options[:lock_file]
-  if File.exists?(options[:lock_file])
+  if File.exist?(options[:lock_file])
     puts "Lock file exists, exiting"
     exit 1
   else
@@ -124,7 +124,7 @@ loop do
   puts "tick"
 
   if options[:watch_file]
-    if File.exists?(options[:watch_file])
+    if File.exist?(options[:watch_file])
       puts "watch file finded"
       File.unlink(options[:watch_file])
 

data/examples/syslog.eye

@@ -0,0 +1,15 @@
+# output eye logger to syslog, and process stdout to syslog too
+#   experimental feature, in some cases may be unstable
+
+Eye.config do
+  logger syslog
+end
+
+Eye.app :syslog_test do
+  process :some do
+    pid_file "/tmp/syslog_test.pid"
+    start_command "ruby -e 'loop { p Time.now; sleep 1 }'"
+    daemonize!
+    stdall syslog
+  end
+end

data/examples/test.eye

@@ -11,6 +11,9 @@ Eye.application 'test' do
   # All options inherits down to the config leafs.
   # except `env`, which merging down
 
+  # uid "user_name" # run app as a user_name (optional) - available only on ruby >= 2.0
+  # gid "group_name" # run app as a group_name (optional) - available only on ruby >= 2.0
+
   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

data/examples/thin-farm.eye

@@ -11,8 +11,8 @@ 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
+  # 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

data/examples/unicorn.eye

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

data/eye.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'celluloid-io',  '~> 0.16.0'
   gem.add_dependency 'state_machine'
   gem.add_dependency 'thor'
-  gem.add_dependency 'sigar',         '~> 0.7.2'
+  gem.add_dependency 'sigar',         '~> 0.7.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '< 2.14'

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = "0.7.pre"
+  VERSION   = "0.7"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/application.rb

@@ -1,6 +1,6 @@
 class Eye::Application
 
-  attr_reader :groups, :name
+  attr_reader :groups, :name, :config
 
   def initialize(name, config = {})
     @groups = Eye::Utils::AliveArray.new
@@ -28,19 +28,12 @@ class Eye::Application
 
   def status_data(debug = false)
     h = { name: @name, type: :application, subtree: @groups.map{|gr| gr.status_data(debug) }}
-    h.merge!(debug: debug_data) if debug
+    h[:debug] = debug_data if debug
     h
   end
 
   def status_data_short
-    h = Hash.new
-    @groups.each do |c|
-      c.processes.each do |p|
-        h[p.state] ||= 0
-        h[p.state] += 1
-      end
-    end
-    { name: @name, type: :application, states: h}
+    { name: @name, type: :application, subtree: @groups.map(&:status_data_short) }
   end
 
   def debug_data

data/lib/eye/checker.rb

@@ -8,6 +8,7 @@ class Eye::Checker
   autoload :FileSize,   'eye/checker/file_size'
   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'
@@ -17,7 +18,7 @@ class Eye::Checker
   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" }
+           :children_count => "ChildrenCount", :children_memory => "ChildrenMemory", :ssl_socket => 'SslSocket' }
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count, :process
 

data/lib/eye/checker/children_count.rb

@@ -14,13 +14,7 @@ class Eye::Checker::ChildrenCount < Eye::Checker::Measure
       super
     else
       pids = ordered_by_date_children_pids
-
-      pids = if strategy == :kill_old
-        pids[0...-below]
-      else
-        pids[below..-1]
-      end
-
+      pids = (strategy == :kill_old) ? pids[0...-below] : pids[below..-1]
       kill_pids(pids)
     end
   end

data/lib/eye/checker/file_touched.rb

@@ -9,7 +9,7 @@ class Eye::Checker::FileTouched < Eye::Checker
   end
 
   def get_value
-    File.exists?(file)
+    File.exist?(file)
   end
 
   def good?(value)

data/lib/eye/checker/http.rb

@@ -21,10 +21,9 @@ 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]
+              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
+              else Net::HTTPSuccess
             end
     @open_timeout = (open_timeout || 3).to_f
     @read_timeout = (read_timeout || timeout || 15).to_f

data/lib/eye/checker/ssl_socket.rb

@@ -0,0 +1,28 @@
+require 'openssl'
+
+class Eye::Checker::SslSocket < Eye::Checker::Socket
+  param :ctx,          Hash, nil, {ssl_version: :SSLv23, verify_mode: OpenSSL::SSL::VERIFY_NONE}
+
+  # other params inherits from socket check
+  #
+  # examples:
+  #
+  #   check :ssl_socket, :addr => "tcp://127.0.0.1:443", :every => 5.seconds, :times => 1, :timeout => 1.second,
+  #     :ctx => {ssl_version: :SSLv23, verify_mode: OpenSSL::SSL::VERIFY_NONE}
+  #
+  #
+  #  ctx_params from http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html
+
+private
+
+  def open_socket
+    OpenSSL::SSL::SSLSocket.new(super, ctx_params).tap do |socket|
+      socket.sync_close = true
+      socket.connect
+    end
+  end
+
+  def ctx_params
+    @ctx_params ||= OpenSSL::SSL::SSLContext.new().tap { |c| c.set_params(ctx) }
+  end
+end

data/lib/eye/child_process.rb

@@ -24,13 +24,13 @@ class Eye::ChildProcess
   # scheduler
   include Eye::Process::Scheduler
 
-  attr_reader :pid, :name, :full_name, :config, :watchers
+  attr_reader :pid, :name, :full_name, :config, :watchers, :parent
 
-  def initialize(pid, config = {}, logger_prefix = nil, parent_pid = nil)
+  def initialize(pid, config = {}, logger_prefix = nil, parent = nil)
     raise 'Empty pid' unless pid
 
     @pid = pid
-    @parent_pid = parent_pid
+    @parent = parent
     @config = prepare_config(config)
     @name = "child-#{pid}"
     @full_name = [logger_prefix, @name] * ':'
@@ -96,6 +96,6 @@ class Eye::ChildProcess
   end
 
   def prepare_command(command) # override
-    super.gsub('{PARENT_PID}', @parent_pid.to_s)
+    super.gsub('{PARENT_PID}', @parent.pid.to_s)
   end
 end

data/lib/eye/cli.rb

@@ -98,18 +98,24 @@ class Eye::Cli < Thor
     ensure_stop_previous_server if res != :corrupted_data
 
     # remove pid_file
-    File.delete(Eye::Local.pid_path) if File.exists?(Eye::Local.pid_path)
+    File.delete(Eye::Local.pid_path) if File.exist?(Eye::Local.pid_path)
 
     say "Quit ಠ╭╮ಠ", :yellow
   end
 
-  [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |_cmd|
-    desc "#{_cmd} MASK[,...]", "#{_cmd} app,group or process"
-    define_method(_cmd) do |*masks|
-      send_command(_cmd, *masks)
+  [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |command|
+    desc "#{command} MASK[,...]", "#{command} app,group or process"
+    define_method(command) do |*masks|
+      send_command(command, *masks)
     end
   end
 
+  desc "force_restart MASK[,...]", "restart by stop;start (not by restart_command)"
+  def force_restart(*masks)
+    send_command(:stop, *masks)
+    send_command(:start, *masks)
+  end
+
   desc "signal SIG MASK[,...]", "send signal to app,group or process"
   def signal(sig, *masks)
     send_command(:signal, sig, *masks)
@@ -189,7 +195,7 @@ private
 
   def log_trace(tag = '')
     log_file = cmd(:logger_dev)
-    if log_file && File.exists?(log_file)
+    if log_file && File.exist?(log_file)
       Process.exec "tail -n 100 -f #{log_file} | grep '#{tag}'"
     else
       error! "log file not found #{log_file.inspect}"

data/lib/eye/cli/commands.rb

@@ -27,10 +27,10 @@ private
     error!(res) unless res.is_a?(Hash)
     say_filename = (res.size > 1)
     error = false
-    res.each do |filename, _res|
+    res.each do |filename, res2|
       say "#{filename}: ", nil, true if say_filename
-      show_load_message(_res, opts)
-      error = true if _res[:error]
+      show_load_message(res2, opts)
+      error = true if res2[:error]
     end
 
     exit(1) if error
@@ -54,10 +54,10 @@ private
     end
   end
 
-  def send_command(_cmd, *args)
-    res = cmd(_cmd, *args)
+  def send_command(command, *args)
+    res = cmd(command, *args)
     if res == :unknown_command
-      error! "unknown command :#{_cmd}"
+      error! "unknown command :#{command}"
     elsif res == :corrupted_data
       error! 'something crazy wrong, check eye logs!'
     elsif res.is_a?(Hash)
@@ -65,9 +65,9 @@ private
         error! "Error: #{res[:error]}"
       elsif res = res[:result]
         if res == []
-          error! "command :#{_cmd}, objects not found!"
+          error! "command :#{command}, objects not found!"
         else
-          say "command :#{_cmd} sent to [#{res * ", "}]"
+          say "command :#{command} sent to [#{res * ', '}]"
         end
       end
     else

data/lib/eye/cli/render.rb

@@ -34,7 +34,7 @@ private
         off = level * 2
         off_str = ' ' * off
 
-        short_state = (data[:type] == :application && data[:states])
+        short_state = ((data[:type] == :application || data[:type] == :group) && data[:states])
         is_text = data[:state] || data[:states]
 
         name = (data[:type] == :application && !is_text) ? "\033[1m#{data[:name]}\033[0m" : data[:name].to_s
@@ -105,13 +105,7 @@ private
 
   def render_history(data)
     error!("unexpected server response #{data.inspect}") unless data.is_a?(Hash)
-
-    res = []
-    data.each do |name, data|
-      res << detail_process_info(name, data)
-    end
-
-    res * "\n"
+    data.map { |name, history| detail_process_info(name, history) }.join("\n")
   end
 
   def detail_process_info(name, history)

data/lib/eye/cli/server.rb

@@ -9,7 +9,7 @@ private
 
   def loader_path
     filename = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. bin loader_eye]))
-    File.exists?(filename) ? filename : nil
+    File.exist?(filename) ? filename : nil
   end
 
   def ruby_path
@@ -62,7 +62,8 @@ private
       error! 'server has not started in 15 seconds, something is very wrong'
     end
 
-    configs.unshift(Eye::Local.eyeconfig) if File.exists?(Eye::Local.eyeconfig)
+    configs.unshift(Eye::Local.global_eyeconfig) if File.exist?(Eye::Local.global_eyeconfig)
+    configs.unshift(Eye::Local.eyeconfig) if File.exist?(Eye::Local.eyeconfig)
     configs << Eye::Local.eyefile if Eye::Local.local_runner
 
     say 'Eye started! ㋡', :green

data/lib/eye/client.rb

@@ -13,10 +13,7 @@ class Eye::Client
   end
 
   def attempt_command(pack)
-    Timeout.timeout(Eye::Local.client_timeout) do
-      return send_request(pack)
-    end
-
+    Timeout.timeout(Eye::Local.client_timeout) { send_request(pack) }
   rescue Timeout::Error, EOFError
     :timeouted
   end
@@ -25,7 +22,7 @@ class Eye::Client
     UNIXSocket.open(@socket_path) do |socket|
       socket.write(pack)
       data = socket.read
-      res = Marshal.load(data) rescue :corrupted_data
+      Marshal.load(data) rescue :corrupted_data
     end
   end
 

data/lib/eye/config.rb

@@ -20,11 +20,18 @@ class Eye::Config
   end
 
   def to_h
-    {:settings => @settings, :applications => @applications}
+    h = {}
+    h[:settings] = @settings
+    if Eye.respond_to?(:parsed_default_app)
+      d = Eye.parsed_default_app
+      h[:defaults] = d ? d.config : {}
+    end
+    h[:applications] = @applications
+    h
   end
 
   # raise an error if config wrong
-  def validate!(localize = true)
+  def validate!(validate_apps = [])
     all_processes = processes
 
     # Check blank pid_files
@@ -58,13 +65,36 @@ class Eye::Config
 
     # validate processes with their own validate
     all_processes.each do |process_cfg|
-      Eye::Process.validate process_cfg, localize
+      Eye::Process.validate process_cfg, validate_apps.include?(process_cfg[:application])
     end
 
     # just to be sure ENV was not removed
     ENV[''] rescue raise Eye::Dsl::Error.new("ENV is not a hash '#{ENV.inspect}'")
   end
 
+  def transform!
+    all_processes = processes
+
+    # transform syslog option
+    all_processes.each do |process|
+      out = process[:stdout] && process[:stdout].start_with?(':syslog')
+      err = process[:stderr] && process[:stderr].start_with?(':syslog')
+      if err || out
+        redir = err ? '2>&1' : ''
+        process[:stdout] = nil if out
+        process[:stderr] = nil if err
+
+        escaped_start_command = process[:start_command].to_s.gsub(%{"}, %{\\"})
+
+        names = [process[:application], process[:group] == '__default__' ? nil :  process[:group], process[:name]].compact
+        logger = "logger -t \"#{names.join(':')}\""
+
+        process[:start_command] = %{sh -c "#{escaped_start_command} #{redir} | #{logger}"}
+        process[:use_leaf_child] = true if process[:daemonize]
+      end
+    end
+  end
+
   def processes
     applications.values.map{|e| (e[:groups] || {}).values.map{|c| (c[:processes] || {}).values} }.flatten
   end

data/lib/eye/controller.rb

@@ -1,7 +1,6 @@
 require 'celluloid'
 require 'yaml'
 
-require_relative 'utils/celluloid_klass'
 require_relative 'utils/pmap'
 
 require_relative 'utils/leak_19'

data/lib/eye/controller/load.rb

@@ -9,7 +9,7 @@ module Eye::Controller::Load
   end
 
   def load(*args)
-    h = args.extract_options!
+    args.extract_options!
     obj_strs = args.flatten
     info "=> loading: #{obj_strs}"
 
@@ -49,7 +49,7 @@ private
     error bt.join("\n")
 
     res = { :error => true, :message => ex.message }
-    res.merge!(:backtrace => bt) if bt.present?
+    res[:backtrace] = bt if bt.present?
     res
   end
 
@@ -58,12 +58,7 @@ private
     return res if obj_strs.empty?
 
     obj_strs.each do |filename|
-      mask = if File.directory?(filename)
-        File.join filename, '{*.eye}'
-      else
-        filename
-      end
-
+      mask = File.directory?(filename) ? File.join(filename, '{*.eye}') : filename
       debug { "loading: globbing mask #{mask}" }
 
       sub = []
@@ -83,7 +78,7 @@ private
     debug { "parsing: #{filename}" }
 
     cfg = Eye::Dsl.parse(nil, filename)
-    @current_config.merge(cfg).validate!(false) # just validate summary config here
+    @current_config.merge(cfg).validate! # just validate summary config here
     Eye.parsed_config = nil # remove link on config, for better gc
     cfg
   end
@@ -92,7 +87,7 @@ private
   def load_config(filename, config)
     info "loading: #{filename}"
     new_cfg = @current_config.merge(config)
-    new_cfg.validate!
+    new_cfg.validate!(config.application_names)
 
     load_options(new_cfg.settings)
     create_objects(new_cfg.applications, config.application_names)

data/lib/eye/controller/status.rb

@@ -2,7 +2,7 @@ module Eye::Controller::Status
 
   def debug_data(*args)
     h = args.extract_options!
-    actors = Celluloid::Actor.all.map{|actor| actor.__klass__ }.group_by{|a| a}.map{|k,v| [k, v.size]}.sort_by{|a|a[1]}.reverse
+    actors = Celluloid::Actor.all.map{|actor| actor.wrapped_object.class.to_s }.group_by{|a| a}.map{|k,v| [k, v.size]}.sort_by{ |a| a[1] }.reverse
 
     res = {
       :about => Eye::ABOUT,

data/lib/eye/dsl.rb

@@ -27,7 +27,6 @@ class Eye::Dsl
     def parse(content = nil, filename = nil)
       Eye.parsed_config = Eye::Config.new
       Eye.parsed_filename = filename
-      Eye.parsed_default_app = nil
 
       content = File.read(filename) if content.blank?
 
@@ -35,7 +34,8 @@ class Eye::Dsl
         Kernel.eval(content, Eye::BINDING, filename.to_s)
       end
 
-      Eye.parsed_config.validate!(false)
+      Eye.parsed_config.transform!
+      Eye.parsed_config.validate!
       Eye.parsed_config
     end
 

data/lib/eye/dsl/config_opts.rb

@@ -12,6 +12,13 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
   end
   alias logger= logger
 
+  def syslog(name = 'eye', *args)
+    require 'syslog/logger'
+    Syslog::Logger.new(name, *args)
+  rescue LoadError
+    raise Eye::Dsl::Error, "logger syslog requires Ruby >= 2.0"
+  end
+
   # ==== contact options ==============================
   def self.add_notify(type)
     create_options_methods([type], Hash)
@@ -23,7 +30,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     end
   end
 
-  Eye::Notify::TYPES.keys.each { |name| add_notify(name) }
+  Eye::Notify::TYPES.each_key { |name| add_notify(name) }
 
   def contact(contact_name, contact_type, contact, contact_opts = {})
     raise Eye::Dsl::Error, "unknown contact_type #{contact_type}" unless Eye::Notify::TYPES[contact_type]

data/lib/eye/dsl/opts.rb

@@ -19,7 +19,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   def initialize(name = nil, parent = nil)
     super(name, parent)
 
-    @config[:application] = parent.name if parent.is_a?(Eye::Dsl::ApplicationOpts)
+    @config[:application] = parent.name if parent.is_a?(Eye::Dsl::ApplicationOpts) && parent.name != '__default__'
     @config[:group] = parent.name if parent.is_a?(Eye::Dsl::GroupOpts)
 
     # hack for full name
@@ -30,7 +30,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     nac = Eye::Checker.name_and_class(type.to_sym)
     raise Eye::Dsl::Error, "unknown checker type #{type}" unless nac
 
-    opts.merge!(:type => nac[:type])
+    opts[:type] = nac[:type]
     Eye::Checker.validate!(opts)
 
     @config[:checks] ||= {}
@@ -41,7 +41,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     nac = Eye::Trigger.name_and_class(type.to_sym)
     raise Eye::Dsl::Error, "unknown trigger type #{type}" unless nac
 
-    opts.merge!(:type => nac[:type])
+    opts[:type] = nac[:type]
     Eye::Trigger.validate!(opts)
 
     @config[:triggers] ||= {}
@@ -184,7 +184,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   def load_env(filename = '~/.env', raise_when_no_file = true)
     fnames = [File.expand_path(filename, @config[:working_dir]),
       File.expand_path(filename)].uniq
-    filenames = fnames.select { |f| File.exists?(f) }
+    filenames = fnames.select { |f| File.exist?(f) }
 
     if filenames.size < 1
       unless raise_when_no_file
@@ -205,6 +205,10 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:skip_group_actions][act] = val
   end
 
+  def syslog
+    ':syslog'
+  end
+
 private
 
   def validate_signals(signals = nil)

data/lib/eye/dsl/pure_opts.rb

@@ -82,7 +82,7 @@ class Eye::Dsl::PureOpts
   def use(proc, *args)
     if proc.is_a?(String)
       self.class.with_parsed_file(proc) do |path|
-        if File.exists?(path)
+        if File.exist?(path)
           Eye::Dsl.debug { "=> load #{path}" }
           self.instance_eval(File.read(path))
           Eye::Dsl.debug { "<= load #{path}" }
@@ -101,8 +101,6 @@ class Eye::Dsl::PureOpts
 
   def nop(*args, &block); end
 
-private
-
   def self.with_parsed_file(file_name)
     saved_parsed_filename = Eye.parsed_filename
 

data/lib/eye/dsl/validation.rb

@@ -20,13 +20,13 @@ module Eye::Dsl::Validation
     def defaults; @defaults ||= {}; end
     def variants; @variants ||= {}; end
 
-    def param(param, types = [], should_be = false, default = nil, _variants = nil)
+    def param(param, types = [], should_be = false, default = nil, variants = nil)
       param = param.to_sym
 
-      validates[param] = types
-      should_bes << param if should_be
+      self.validates[param] = types
+      self.should_bes << param if should_be
       param_default(param, default)
-      variants[param] = _variants
+      self.variants[param] = variants
 
       return if param == :do
 

data/lib/eye/group.rb

@@ -49,7 +49,7 @@ class Eye::Group
 
     h = { name: name, type: :group, subtree: plist }
 
-    h.merge!(debug: debug_data) if debug
+    h[:debug] = debug_data if debug
 
     # show current chain
     if current_scheduled_command
@@ -67,6 +67,15 @@ class Eye::Group
     h
   end
 
+  def status_data_short
+    h = Hash.new
+    @processes.each do |p|
+      h[p.state] ||= 0
+      h[p.state] += 1
+    end
+    { name: (@name == '__default__' ? 'default' : @name), type: :group, states: h }
+  end
+
   def debug_data
     {:queue => scheduler_actions_list, :chain => chain_status}
   end
@@ -76,9 +85,9 @@ class Eye::Group
 
     case command
       when :delete
-        delete *args
+        delete(*args)
       when :break_chain
-        break_chain *args
+        break_chain(*args)
       else
         schedule command, *args, Eye::Reason::User.new(command)
     end

data/lib/eye/local.rb

@@ -12,16 +12,14 @@ module Eye::Local
       end
     end
 
-    def dir=(d)
-      @dir = d
+    attr_writer :dir, :client_timeout, :host
+
+    def global_eyeconfig
+      '/etc/eye.conf'
     end
 
     def eyeconfig
-      if root?
-        '/etc/eye.conf'
-      else
-        File.expand_path(File.join(home, '.eyeconfig'))
-      end
+      File.expand_path(File.join(home, '.eyeconfig'))
     end
 
     def root?
@@ -62,10 +60,6 @@ module Eye::Local
       @client_timeout ||= default_client_timeout
     end
 
-    def client_timeout=(cl)
-      @client_timeout = cl
-    end
-
     def supported_setsid?
       RUBY_VERSION >= '2.0'
     end
@@ -77,10 +71,6 @@ module Eye::Local
       end
     end
 
-    def host=(hostname)
-      @host = hostname
-    end
-
     def eyefile
       @eyefile ||= find_eyefile('.')
     end

data/lib/eye/notify.rb

@@ -108,12 +108,9 @@ class Eye::Notify
     end
   end
 
-private
-
   %w{at host message name full_name pid level}.each do |name|
     define_method("msg_#{name}") do
       @message_h[name.to_sym]
     end
   end
-
 end

data/lib/eye/process/children.rb

@@ -32,7 +32,7 @@ module Eye::Process::Children
     if new_children.present?
       new_children.each do |child_pid|
         cfg = self[:monitor_children].try :update, :notify => self[:notify]
-        self.children[child_pid] = Eye::ChildProcess.new(child_pid, cfg, logger.prefix, self.pid)
+        self.children[child_pid] = Eye::ChildProcess.new(child_pid, cfg, logger.prefix, current_actor)
       end
     end
 

data/lib/eye/process/commands.rb

@@ -170,7 +170,7 @@ private
 
   def daemonize_process
     time_before = Time.now
-    res = Eye::System.daemonize(self[:start_command], config)
+    res = daemonize(self[:start_command], config)
     start_time = Time.now - time_before
 
     info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: '#{environment_string}', <#{res[:pid]}> (in #{self[:working_dir]})"

data/lib/eye/process/data.rb

@@ -43,8 +43,8 @@ module Eye::Process::Data
                 state_reason: @states_history.last_reason.to_s )
     end
 
-    h.merge!(debug: debug_data) if debug
-    h.merge!(current_command: current_scheduled_command) if current_scheduled_command
+    h[:debug] = debug_data if debug
+    h[:current_command] = current_scheduled_command if current_scheduled_command
 
     h
   end

data/lib/eye/process/scheduler.rb

@@ -53,6 +53,10 @@ module Eye::Process::Scheduler
     info "<= #{command}"
 
     schedule_history.push(command, reason, @last_scheduled_at.to_i)
+
+    if parent = self.try(:parent)
+      parent.schedule_history.push("#{command}_child", reason, @last_scheduled_at.to_i)
+    end
   end
 
   def scheduler_actions_list

data/lib/eye/process/system.rb

@@ -3,7 +3,7 @@ require 'timeout'
 module Eye::Process::System
 
   def load_pid_from_file
-    res = if File.exists?(self[:pid_file_ex])
+    res = if File.exist?(self[:pid_file_ex])
       _pid = File.read(self[:pid_file_ex]).to_i
       _pid > 0 ? _pid : nil
     end
@@ -73,19 +73,25 @@ module Eye::Process::System
   end
 
   def execute(cmd, cfg = {})
-    defer{ Eye::System::execute cmd, cfg }
+    defer { Eye::System::execute cmd, cfg }.tap do |res|
+      notify(:debug, "Bad exit status of command #{cmd.inspect}(#{res[:exitstatus].inspect})") if res[:exitstatus] != 0
+    end
+  end
+
+  def daemonize(cmd, cfg = {})
+    Eye::System.daemonize(cmd, cfg)
   end
 
   def execute_sync(cmd, opts = {:timeout => 1.second})
-    res = execute cmd, self.config.merge(opts)
-    info "execute_sync `#{cmd}` with res: #{res}"
-    res
+    execute(cmd, self.config.merge(opts)).tap do |res|
+      info "execute_sync `#{cmd}` with res: #{res}"
+    end
   end
 
   def execute_async(cmd, opts = {})
-    res = Eye::System.daemonize(cmd, self.config.merge(opts))
-    info "execute_async `#{cmd}` with res: #{res}"
-    res
+    daemonize(cmd, self.config.merge(opts)).tap do |res|
+      info "execute_async `#{cmd}` with res: #{res}"
+    end
   end
 
   def failsafe_load_pid

data/lib/eye/system_resources.rb

@@ -36,10 +36,25 @@ class Eye::SystemResources
 
     # last child in a children tree
     def leaf_child(pid)
+      if dc = deep_children(pid)
+        dc.detect do |child|
+          args = Eye::Sigar.proc_args(child)[0] rescue ''
+          !args.start_with?('logger') && child != pid
+        end
+      end
+    end
+
+    def deep_children(pid)
+      Array(pid_or_children(pid)).flatten.sort_by { |pid| -pid }
+    end
+
+    def pid_or_children(pid)
       c = children(pid)
-      return if c.empty?
-      c += children(c.shift) while c.size > 1
-      c[0]
+      if !c || c.empty?
+        pid
+      else
+        c.map { |ppid| pid_or_children(ppid) }
+      end
     end
 
     def resources(pid)

data/lib/eye/utils.rb

@@ -33,7 +33,7 @@ module Eye::Utils
     time = Time.at(unix_time.to_i)
     d1 = time.to_date
     d2 = Time.now.to_date
-    time.strftime (d1 == d2) ? D1 : D2
+    time.strftime((d1 == d2) ? D1 : D2)
   end
 
   DF = '%d %b %H:%M'

data/lib/eye/utils/pmap.rb

@@ -1,7 +1,6 @@
 module Enumerable
   # Simple parallel map using Celluloid::Futures
   def pmap(&block)
-    futures = map { |elem| Celluloid::Future.new(elem, &block) }
-    futures.map { |future| future.value }
+    map { |elem| Celluloid::Future.new(elem, &block) }.map(&:value)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.7.pre
+  version: '0.7'
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +326,7 @@ files:
 - examples/rbenv.eye
 - examples/sidekiq.eye
 - examples/stress_test.eye
+- examples/syslog.eye
 - examples/test.eye
 - examples/thin-farm.eye
 - examples/triggers.eye
@@ -346,6 +347,7 @@ files:
 - lib/eye/checker/nop.rb
 - lib/eye/checker/runtime.rb
 - lib/eye/checker/socket.rb
+- lib/eye/checker/ssl_socket.rb
 - lib/eye/child_process.rb
 - lib/eye/cli.rb
 - lib/eye/cli/commands.rb
@@ -412,7 +414,6 @@ files:
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb
 - lib/eye/utils/celluloid_chain.rb
-- lib/eye/utils/celluloid_klass.rb
 - lib/eye/utils/leak_19.rb
 - lib/eye/utils/mini_active_support.rb
 - lib/eye/utils/pmap.rb
@@ -437,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)

data/lib/eye/utils/celluloid_klass.rb

@@ -1,5 +0,0 @@
-class Celluloid::SyncProxy
-  def __klass__
-    @klass
-  end
-end