eye 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae0406a7f4bd886b167c02a54f60eed9c31c1f50
-  data.tar.gz: 37f991e3ab296e74f568ea84c40e6b57d9240ccb
+  metadata.gz: c291e8ed14e7f8199676afd126f117dbc5a491ed
+  data.tar.gz: be96f87f1d1f70d5666d8a1e63e60516317ec499
 SHA512:
-  metadata.gz: d0fca55046216067bc3a924a3526d1e483f8aceef3a72bac53462978f35df794fd2a4bbfe0e776f989273abb5f8709b7c676302caeffe098c1b6dd07955ccd65
-  data.tar.gz: 5311297341068796e16ae6e13035fbbde98b71891caa3738229bafa7f3762a88c97839b71ecae890f4fb114ef6d60b5aec6f8dfa119e4c7b2ac80f104154ea82
+  metadata.gz: 33701932d6954c9c274e4f80ac87c1c21a257ab53d351b43c65a0d95eba98227e5ca9d889c2ee6a4857ef38df89d89d83bce90f647732fc85a87f8afde9b4f4d
+  data.tar.gz: 9cfe4c03629ef7f28138caa6cf84e73fbc317c19e5d5712e39728fe58137b93fa9674385e9b78413e4f41926d0da7d608b1a13f37fc1d3eb349d72f6cf6336f9

data/.gitignore

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

data/.rspec

@@ -1,3 +1,2 @@
 --color
 --profile
-

data/README.md

@@ -1,7 +1,7 @@
 Eye [![Build Status](https://secure.travis-ci.org/kostya/eye.png?branch=master)](http://travis-ci.org/kostya/eye)
 ===
 
-Process monitoring tool. An alternative to God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
+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.
 
 Little demo, shows general commands and how chain works:
 

data/Rakefile

@@ -3,7 +3,9 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 task :default => :spec
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+end
 
 task :env do
   require 'bundler/setup'

data/bin/eye

@@ -37,21 +37,26 @@ class Cli < Thor
     puts
   end
 
-  desc "load [CONF]", "load config (and start server if needed) (-f for foregraund start)"
+  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(conf = "")
-    conf = File.expand_path(conf) if !conf.empty?
+  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
-      server_start_foregraund(conf)
+      if configs.size != 1
+        say "foregraund expected only one config", :red
+        exit 1
+      end
+
+      server_start_foregraund(configs.first)
 
     elsif server_started?
-      say_load_result cmd(:load, conf)
+      say_load_result cmd(:load, *configs)
 
     else
-      server_start(conf)
+      server_start(configs)
 
     end
   end
@@ -170,20 +175,31 @@ private
   end
   
   def say_load_result(res = {}, opts = {})
-    if res[:error]
-      say "config error: ", :red
-      say res[:message]
+    say(res) unless res.is_a?(Hash)
 
-      res[:backtrace].to_a.each{|line| say line}
+    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
+    end
+  end
 
-      exit 1
-    else 
-      if opts[:started]
-        say "started and loaded!", :yellow if !res[:empty]
-      elsif opts[:syntax]
-        say "config ok!", :yellow if !res[:empty]
+  def show_load_message(res, opts = {})
+    if res[:error]
+      say res[:message], :red
+      res[:backtrace].to_a.each{|line| say line, :red }
+    else
+      all_error = false
+      if opts[:syntax]
+        say "config ok!", :green if !res[:empty]
       else
-        say "config loaded!", :yellow if !res[:empty]        
+        say "config loaded!", :green if !res[:empty]
       end
 
       if opts[:print_config]
@@ -192,7 +208,7 @@ private
       end
     end
   end
-
+ 
   def send_command(_cmd, *args)
     res = cmd(_cmd, *args)
     if res == :unknown_command
@@ -216,8 +232,13 @@ private
   end
   
   def loader_path
-    Gem.bin_path('eye', 'loader_eye')
-  rescue Gem::GemNotFoundException, Gem::Exception
+    if RUBY_VERSION < '1.9'
+      begin
+        return Gem.bin_path('eye', 'loader_eye')
+      rescue Gem::GemNotFoundException, Gem::Exception
+      end
+    end
+
     filename = File.expand_path(File.join(File.dirname(__FILE__), %w[loader_eye]))
     File.exists?(filename) ? filename : nil
   end  
@@ -249,7 +270,7 @@ private
     Process.exec(ruby_path, loader_path, *args)
   end
 
-  def server_start(conf = nil)
+  def server_start(configs)
     ensure_loader_path
     Eye::Settings.ensure_eye_dir
 
@@ -268,10 +289,12 @@ private
       exit 1
     end
 
-    if conf && !conf.empty?
-      say_load_result cmd(:load, conf), :started => true
+    configs.unshift(Eye::Settings.eyeconfig) if File.exists?(Eye::Settings.eyeconfig)
+
+    if !configs.empty?
+      say_load_result cmd(:load, *configs), :started => true
     else
-      say "started!", :yellow
+      say "started!", :green
     end
   end
 

data/lib/eye.rb

@@ -1,6 +1,7 @@
 module Eye  
-  VERSION   = "0.3"
+  VERSION   = "0.3.1"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
+  PROCLINE  = "eye monitoring v#{VERSION}"
 
   autoload :Process,        'eye/process'
   autoload :ChildProcess,   'eye/child_process'
@@ -17,6 +18,8 @@ module Eye
   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/checker.rb

@@ -11,7 +11,7 @@ class Eye::Checker
   TYPES = {:memory => "Memory", :cpu => "Cpu", :http => "Http", 
            :ctime => "FileCTime", :fsize => "FileSize", :socket => "Socket"}
 
-  attr_accessor :value, :values, :options, :pid, :type
+  attr_accessor :value, :values, :options, :pid, :type, :check_count
 
   def self.get_class(type)
     klass = eval("Eye::Checker::#{TYPES[type]}") rescue nil
@@ -37,6 +37,7 @@ class Eye::Checker
     
     @value = nil
     @values = Eye::Utils::Tail.new(max_tries)
+    @check_count = 0
   end
 
   def last_human_values
@@ -49,10 +50,11 @@ class Eye::Checker
   end
 
   def check
-    @value = get_value
+    @value = get_value_safe
     @values << {:value => @value, :good => good?(value)}
 
     result = true
+    @check_count += 1
 
     if @values.size == max_tries
       bad_count = @values.count{|v| !v[:good] }
@@ -63,6 +65,10 @@ class Eye::Checker
     result
   end
 
+  def get_value_safe
+    get_value
+  end
+
   def get_value
     raise 'Realize me'
   end
@@ -115,8 +121,18 @@ class Eye::Checker
   param :fire, Symbol, nil, nil, [:stop, :restart, :unmonitor, :nothing]
 
   class Defer < Eye::Checker
-    def get_value
-      Celluloid::Future.new{ get_value_deferred }.value
+    def get_value_safe
+      Celluloid::Future.new{ get_value }.value
+    end
+  end
+
+  class Custom < 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)
     end
   end
 end

data/lib/eye/checker/http.rb

@@ -29,7 +29,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     @read_timeout = (read_timeout || timeout || 15).to_f
   end
   
-  def get_value_deferred
+  def get_value
     res = session.start{ |http| http.get(@uri.request_uri) }
     {:result => res}
 

data/lib/eye/checker/socket.rb

@@ -35,7 +35,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
     end
   end
 
-  def get_value_deferred
+  def get_value
     sock = begin
       Timeout::timeout(@open_timeout){ open_socket }
     rescue Timeout::Error

data/lib/eye/child_process.rb

@@ -55,7 +55,7 @@ class Eye::ChildProcess
   end
 
   def send_command(command, *args)
-    schedule command, *args, "#{command} by user"
+    schedule command, *args, Eye::Reason::User.new(command)
   end
 
   def start

data/lib/eye/config.rb

@@ -0,0 +1,88 @@
+class Eye::Config
+
+  attr_reader :settings, :applications
+
+  def initialize(settings = {}, applications = {})
+    @settings = settings
+    @applications = applications
+  end
+
+  def merge(other_config)
+    Eye::Config.new(@settings.merge(other_config.settings), @applications.merge(other_config.applications))
+  end
+
+  def merge!(other_config)
+    @settings.merge!(other_config.settings)
+    @applications.merge!(other_config.applications)
+  end
+
+  def to_h
+    {:settings => @settings, :applications => @applications}
+  end
+
+  # raise an error if config wrong
+  def validate!
+    all_processes = processes
+
+    # Check blank pid_files
+    no_pid_file = all_processes.select{|c| c[:pid_file].blank? }
+    if no_pid_file.present?
+      raise Eye::Dsl::Error, "blank pid_file for: #{no_pid_file.map{|c| c[:name]} * ', '}"
+    end
+
+    # Check dublicates of the full pid_file
+
+    dubl_pids = all_processes.each_with_object(Hash.new(0)) do |o, h| 
+      ex_pid_file = Eye::System.normalized_file(o[:pid_file], o[:working_dir])
+      h[ex_pid_file] += 1
+    end
+    dubl_pids = dubl_pids.select{|k,v| v>1}
+
+    if dubl_pids.present?
+      raise Eye::Dsl::Error, "dublicate pid_files: #{dubl_pids.inspect}"
+    end
+
+    # Check dublicates of the full_name
+    dubl_names = all_processes.each_with_object(Hash.new(0)) do |o, h| 
+      full_name = "#{o[:application]}:#{o[:group]}:#{o[:name]}"
+      h[full_name] += 1
+    end
+    dubl_names = dubl_names.select{|k,v| v>1}
+
+    if dubl_names.present?
+      raise Eye::Dsl::Error, "dublicate names: #{dubl_names.inspect}"
+    end
+
+    # validate processes with their own validate
+    all_processes.each do |process_cfg|
+      Eye::Process.validate process_cfg
+    end
+  end
+
+  def processes
+    applications.values.map{|e| (e[:groups] || {}).values.map{|c| (c[:processes] || {}).values} }.flatten
+  end
+
+  def application_names
+    applications.keys
+  end
+
+  def delete_app(name)
+    applications.delete(name)
+  end
+
+  def delete_group(name)
+    applications.each do |app_name, app_cfg|
+      app_cfg[:groups].delete(name)
+    end
+  end
+
+  def delete_process(name)
+    applications.each do |app_name, app_cfg|
+      app_cfg[:groups].each do |gr_name, gr_cfg|
+        gr_cfg[:processes].delete(name)
+      end
+    end
+  end
+
+end

data/lib/eye/controller.rb

@@ -20,6 +20,7 @@ class Eye::Controller
   autoload :Status,         'eye/controller/status'
   autoload :SendCommand,    'eye/controller/send_command'
   autoload :ShowHistory,    'eye/controller/show_history'
+  autoload :Options,        'eye/controller/options'
 
   include Eye::Logger::Helpers
   include Eye::Controller::Load
@@ -28,12 +29,13 @@ class Eye::Controller
   include Eye::Controller::Status
   include Eye::Controller::SendCommand
   include Eye::Controller::ShowHistory
+  include Eye::Controller::Options
 
   attr_reader :applications, :current_config
 
   def initialize
     @applications = []
-    @current_config = Eye::Dsl.initial_config
+    @current_config = Eye::Config.new
 
     Eye.instance_variable_set(:@logger, Eye::Logger.new('eye'))
     @logger = Eye.logger 
@@ -44,8 +46,8 @@ class Eye::Controller
     info "starting #{Eye::ABOUT} (#{$$})"
   end
 
-  def self_config
-    current_config[:config]
+  def settings
+    current_config.settings
   end
 
 end

data/lib/eye/controller/helpers.rb

@@ -1,7 +1,7 @@
 module Eye::Controller::Helpers
 
   def set_proc_line
-    str = "eye monitoring v#{Eye::VERSION}"
+    str = Eye::PROCLINE
     str += " (#{@applications.map(&:name) * ', '})" if @applications.present?
     $0 = str
   end

data/lib/eye/controller/load.rb

@@ -1,24 +1,29 @@
 module Eye::Controller::Load
-  include Eye::Dsl::Validate
 
-  def check(filename = '')
-    catch_load_error(filename) do
-      parse_config(filename)
-    end
+  def check(filename)
+    { filename => catch_load_error(filename) { parse_config(filename).to_h } }
   end
 
   def explain(filename)
-    catch_load_error(filename) do
-      parse_set_of_configs(filename)
-    end
+    { filename => catch_load_error(filename) { parse_config(filename).to_h } }
   end
 
-  # filename is a path, or folder, or mask
-  def load(filename = '')
-    catch_load_error(filename) do
-      _load(filename)
-      set_proc_line
+  def load(*obj_strs)
+    info "load: #{obj_strs}"
+
+    res = Hash.new
+
+    globbing(*obj_strs).each do |filename|
+      res[filename] = catch_load_error(filename) do
+        cfg = parse_config(filename)
+        load_config(filename, cfg)
+        nil
+      end
     end
+
+    set_proc_line
+
+    res
   end
 
 private
@@ -26,8 +31,8 @@ private
   # regexp for clean backtrace to show for user
   BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:|active_support/core_ext|shellwords.rb].freeze
 
-  def catch_load_error(filename, &block)
-    {:error => false, :config => yield }
+  def catch_load_error(filename = nil, &block)
+    { :error => false, :config => yield }
 
   rescue Eye::Dsl::Error, Exception, NoMethodError => ex
     error "load: config error <#{filename}>: #{ex.message}"
@@ -37,88 +42,71 @@ private
     bt = bt.reject{|line| line.to_s =~ BT_REGX }
     error bt.join("\n")
 
-    res = {:error => true, :message => ex.message}
+    res = { :error => true, :message => ex.message }
     res.merge!(:backtrace => bt) if bt.present?
     res
   end
 
-  # return: result, config
-  def parse_config(filename = '', &block)
-    raise Eye::Dsl::Error, "config file '#{filename}' not found!" unless File.exists?(filename)
-
-    cfg = Eye::Dsl.parse(nil, filename)
-    validate( merge_configs(@current_config, cfg) )
-
-    cfg
-  end
-
-  def parse_set_of_configs(filename)
-    mask = if File.directory?(filename)
-      File.join filename, '{*.eye}'
-    else
-      filename
-    end
+  def globbing(*obj_strs)
+    res = []
+    return res if obj_strs.empty?
 
-    debug "load: globbing mask #{mask}"
-    configs = []
-
-    Dir[mask].each do |config_path|
-      info "load: config #{config_path}"
-      configs << parse_config(config_path)
-    end
+    obj_strs.each do |filename|
+      mask = if File.directory?(filename)
+        File.join filename, '{*.eye}'
+      else
+        filename
+      end
 
-    raise Eye::Dsl::Error, "config file '#{mask}' not found!" if configs.blank?
+      debug "load: globbing mask #{mask}"
 
-    @loaded_config = Eye::Dsl.initial_config
-    configs.each do |cfg| 
-      @loaded_config = merge_configs(@loaded_config, cfg)
+      sub = []
+      Dir[mask].each do |config_path|
+        sub << config_path
+      end
+      sub = [mask] if sub.empty?
+      
+      res += sub
     end
 
-    new_cfg = merge_configs(@current_config, @loaded_config)
-    validate(new_cfg)
-    new_cfg
+    res
   end
 
-  def _load(filename)
-    info "load: #{filename} in #{Eye::VERSION}"
-    new_cfg = parse_set_of_configs(filename)
-    
-    load_config(new_cfg, @loaded_config[:applications].keys)
-    @loaded_config = nil
-  end
+  # return: result, config
+  def parse_config(filename)    
+    raise Eye::Dsl::Error, "config file '#{filename}' not found!" unless File.exists?(filename)
+    debug "parse #{filename}"
 
-  def load_config(new_config, changed_apps = [])
-    load_options(new_config[:config])
-    create_objects(new_config[:applications], changed_apps)
-    @current_config = new_config
+    cfg = Eye::Dsl.parse(nil, filename)
+    @current_config.merge(cfg).validate! # just validate summary config here
+    cfg
   end
 
-  def merge_configs(old_config, new_config)
-    {:config => old_config[:config].merge(new_config[:config]),
-     :applications => old_config[:applications].merge(new_config[:applications])}
+  # !!! exclusive operation
+  def load_config(filename, config)
+    info "load #{filename}"
+    new_cfg = @current_config.merge(config)
+    new_cfg.validate!
+    
+    load_options(new_cfg.settings)
+    create_objects(new_cfg.applications, config.application_names)
+    @current_config = new_cfg
   end
 
   # load global config options
   def load_options(opts)
     return if opts.blank?
 
-    if opts[:logger]
-      # do not apply logger, if in stdout state
-      if !%w{stdout stderr}.include?(Eye::Logger.dev)
-        if opts[:logger].blank?
-          Eye::Logger.link_logger(nil)
-        else
-          Eye::Logger.link_logger(opts[:logger])
-        end
-      end
-      
-      Eye::Logger.log_level = opts[:logger_level] if opts[:logger_level]
+    opts.each do |key, value|
+      method = "set_opt_#{key}"
+      send(method, value) if value && respond_to?(method)
     end
   end
 
   # create objects as diff, from configs
   def create_objects(apps_config, changed_apps = [])
     debug 'create objects'
+
     apps_config.each do |app_name, app_cfg|
       update_or_create_application(app_name, app_cfg.clone) if changed_apps.include?(app_name)
     end
@@ -190,7 +178,7 @@ private
     group = if @old_groups[group_name]
       debug "update group #{group_name}"
       group = @old_groups.delete(group_name)
-      group.schedule :update_config, group_config, 'load config'
+      group.schedule :update_config, group_config, Eye::Reason::User.new(:'load config')
       group.clear
       group
     else
@@ -213,7 +201,7 @@ private
     if @old_processes[process_name]
       debug "update process #{process_name}"
       process = @old_processes.delete(process_name)
-      process.schedule :update_config, process_cfg, 'load config'
+      process.schedule :update_config, process_cfg, Eye::Reason::User.new(:'load config')
       process      
     else
       debug "create process #{process_name}"

data/lib/eye/controller/options.rb

@@ -0,0 +1,22 @@
+module Eye::Controller::Options
+
+  def set_opt_logger(logger)
+    # do not apply logger, if in stdout state
+    if !%w{stdout stderr}.include?(Eye::Logger.dev)
+      if logger.blank?
+        Eye::Logger.link_logger(nil)
+      else
+        Eye::Logger.link_logger(logger)
+      end
+    end
+  end
+
+  def set_opt_logger_level(level)
+    Eye::Logger.log_level = level
+  end
+
+  def set_opt_http(opts = {})
+    # stub!
+  end
+
+end

data/lib/eye/controller/send_command.rb

@@ -41,24 +41,17 @@ private
 
     if klass == Eye::Application
       @applications.delete(obj)
-      @current_config[:applications].delete(obj.name)
+      @current_config.delete_app(obj.name)
     end
 
     if klass == Eye::Group
       @applications.each{|app| app.groups.delete(obj) }
-      @current_config[:applications].each do |app_name, app_cfg|
-        app_cfg[:groups].delete(obj.name)
-      end
+      @current_config.delete_group(obj.name)
     end
 
     if klass == Eye::Process
       @applications.each{|app| app.groups.each{|gr| gr.processes.delete(obj) }}
-
-      @current_config[:applications].each do |app_name, app_cfg|
-        app_cfg[:groups].each do |gr_name, gr_cfg|
-          gr_cfg[:processes].delete(obj.name)
-        end
-      end
+      @current_config.delete_process(obj.name)
     end    
   end
 
@@ -68,7 +61,10 @@ private
     return [] if obj_strs.blank?
     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
+    res = []
+    obj_strs.map{|c| c.split(",")}.flatten.each do |mask|
+      res += find_objects_by_mask(mask)
+    end
 
     if res.size > 1
       # remove inherited targets
@@ -107,7 +103,7 @@ private
           res << p if p.name =~ r || p.full_name =~ r
 
           if p.childs.present?
-            res += p.childs.values.select{|ch| ch.name =~ r || ch.full_name =~ r }
+            res += p.childs.values.select{|ch| ch.alive? && (ch.name =~ r || ch.full_name =~ r) }
           end
         end
       end

data/lib/eye/controller/show_history.rb

@@ -39,7 +39,7 @@ private
     res = "\033[1m#{name}\033[0m:\n"
     history = history.reverse
 
-    history.chunk{|h| [h[:state], h[:reason]] }.each do |_, hist|
+    history.chunk{|h| [h[:state], h[:reason].to_s] }.each do |_, hist|
       if hist.size >= 3
         res << detail_process_info_string(hist[0])
         res << detail_process_info_string(:state => "... #{hist.size - 2} times", :reason => '...', :at => hist[-1][:at])

data/lib/eye/controller/status.rb

@@ -29,9 +29,10 @@ module Eye::Controller::Status
     str = <<-S
 About:  #{Eye::ABOUT}
 Info:   #{resources_str(Eye::SystemResources.resources($$), false)}
+Ruby:   #{RUBY_DESCRIPTION}
 Logger: #{Eye::Logger.dev}
 Socket: #{Eye::Settings::socket_path}
-PidPath: #{Eye::Settings::pid_path}
+Pid:    #{Eye::Settings::pid_path}
 Actors: #{actors.inspect}
 
     S
@@ -40,7 +41,7 @@ Actors: #{actors.inspect}
 
     if show_config.present?
       str += "\nCurrent config: \n"
-      str += YAML.dump(current_config)
+      str += YAML.dump(current_config.to_h)
     end
 
     GC.start

data/lib/eye/dsl.rb

@@ -11,13 +11,11 @@ class Eye::Dsl
   autoload :ChildProcessOpts,     'eye/dsl/child_process_opts'
   autoload :Opts,                 'eye/dsl/opts'
   autoload :PureOpts,             'eye/dsl/pure_opts'
-  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
 
   class << self
     attr_accessor :verbose
@@ -26,12 +24,8 @@ class Eye::Dsl
       puts msg if verbose
     end
 
-    def initial_config
-      {:config => {}, :applications => {}}
-    end
-
     def parse(content = nil, filename = nil)
-      Eye.parsed_config = initial_config
+      Eye.parsed_config = Eye::Config.new
       Eye.parsed_filename = filename
       
       content = File.read(filename) if content.blank?
@@ -40,13 +34,12 @@ class Eye::Dsl
         Kernel.eval(content, Eye::BINDING, filename.to_s)
       end
       
-      validate(Eye.parsed_config)
-
+      Eye.parsed_config.validate!
       Eye.parsed_config
     end
 
     def parse_apps(*args)
-      parse(*args)[:applications] || {}
+      parse(*args).applications
     end
   end
 end

data/lib/eye/dsl/config_opts.rb

@@ -24,7 +24,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     raise Eye::Dsl::Error, "unknown contact_type #{contact_type}" unless Eye::Notify::TYPES[contact_type]    
     raise Eye::Dsl::Error, "contact should be a String" unless contact.is_a?(String)
 
-    notify_hash = @config[contact_type] || (@parent && @parent.config[contact_type]) || Eye::parsed_config[:config][contact_type] || {}
+    notify_hash = @config[contact_type] || (@parent && @parent.config[contact_type]) || Eye::parsed_config.settings[contact_type] || {}
     validate_hash = notify_hash.merge(contact_opts).merge(:type => contact_type)
 
     Eye::Notify.validate!(validate_hash)

data/lib/eye/dsl/main.rb

@@ -6,9 +6,7 @@ module Eye::Dsl::Main
     opts = Eye::Dsl::ApplicationOpts.new(name)
     opts.instance_eval(&block)
 
-    @parsed_config ||= {}
-    @parsed_config[:applications] ||= {}
-    @parsed_config[:applications][name.to_s] = opts.config if opts.config
+    @parsed_config.applications[name.to_s] = opts.config if opts.config
 
     Eye::Dsl.debug "<= app: #{name}"
   end
@@ -32,12 +30,9 @@ module Eye::Dsl::Main
   def config(&block)
     Eye::Dsl.debug "=> config"
 
-    @parsed_config ||= {}
-    @parsed_config[:config] ||= {}
-
     opts = Eye::Dsl::ConfigOpts.new
     opts.instance_eval(&block)
-    @parsed_config[:config].merge!(opts.config)
+    @parsed_config.settings.merge!(opts.config)
 
     Eye::Dsl.debug "<= config"
   end

data/lib/eye/group.rb

@@ -74,7 +74,7 @@ class Eye::Group
       when :break_chain 
         break_chain *args
       else 
-        schedule command, *args, "#{command} by user"
+        schedule command, *args, Eye::Reason::User.new(command)
     end
   end
 

data/lib/eye/notify.rb

@@ -19,14 +19,14 @@ class Eye::Notify
   end
 
   def self.notify(contact, message_h)
-    self_config = Eye::Control.self_config
-    needed_hash = (self_config[:contacts] || {})[contact.to_s]
+    settings = Eye::Control.settings
+    needed_hash = (settings[:contacts] || {})[contact.to_s]
 
     return if needed_hash.blank?
 
     create_proc = lambda do |nh|
       type = nh[:type]
-      config = (self_config[type] || {}).merge(nh[:opts] || {}).merge(:contact => nh[:contact])
+      config = (settings[type] || {}).merge(nh[:opts] || {}).merge(:contact => nh[:contact])
       klass = get_class(type)
       notify = klass.new(config, message_h)
       notify.async_notify if notify

data/lib/eye/process/controller.rb

@@ -1,7 +1,7 @@
 module Eye::Process::Controller
 
   def send_command(command, *args)
-    schedule command, *args, "#{command} by user"
+    schedule command, *args, Eye::Reason::User.new(command)
   end
 
   def start
@@ -44,7 +44,7 @@ module Eye::Process::Controller
         switch :already_running
       else
         warn "process not found, so :unmonitor"
-        schedule :unmonitor, 'not found'
+        schedule :unmonitor, Eye::Reason.new(:'not found')
       end
     end
   end

data/lib/eye/process/monitor.rb

@@ -40,7 +40,7 @@ private
       unless process_realy_running?
         warn "check_alive: process(#{self.pid}) not found!"
         notify :info, 'crashed!'
-        switch :crashed, 'crashed'
+        switch :crashed, Eye::Reason.new(:crashed)
       else
         # check that pid_file still here
         ppid = failsafe_load_pid
@@ -78,10 +78,10 @@ private
     if down?
       if self[:keep_alive]
         warn 'check crashed: process is down'
-        schedule :restore, 'crashed'
+        schedule :restore, Eye::Reason.new(:crashed)
       else
         warn 'check crashed: process without keep_alive'
-        schedule :unmonitor, 'crashed'
+        schedule :unmonitor, Eye::Reason.new(:crashed)
       end
     else
       debug 'check crashed: skipped, process is not in down'

data/lib/eye/process/scheduler.rb

@@ -8,12 +8,21 @@ module Eye::Process::Scheduler
         return
       end
 
-      reason = if args.present? && [String, Symbol].include?(args[-1].class)
+      reason = if args.present? && args[-1].kind_of?(Eye::Reason)
         args.pop
       end
 
       info "schedule :#{command} #{reason ? "(reason: #{reason})" : nil}"
-      scheduler.add_wo_dups(:scheduled_action, command, {:args => args, :reason => reason}, &block)
+
+      if reason.class == Eye::Reason
+        # for auto reasons
+        # skip already running commands and all in chain
+        scheduler.add_wo_dups_current(:scheduled_action, command, {:args => args, :reason => reason}, &block)  
+      else
+        # for manual, or without reason
+        # skip only for last in chain
+        scheduler.add_wo_dups(:scheduled_action, command, {:args => args, :reason => reason}, &block)
+      end
     end
   end
 

data/lib/eye/process/states.rb

@@ -61,7 +61,7 @@ class Eye::Process
   end
 
   def on_crashed
-    schedule :check_crash, 'crashed'
+    schedule :check_crash, Eye::Reason.new(:crashed)
   end
 
   def on_unmonitored

data/lib/eye/process/trigger.rb

@@ -31,7 +31,7 @@ private
 
   def on_flapping(trigger)
     notify :error, 'flapping!'
-    schedule :unmonitor, "flapping"
+    schedule :unmonitor, Eye::Reason.new(:flapping)
 
     @retry_times ||= 0
     retry_in = trigger.retry_in
@@ -47,7 +47,7 @@ private
     return unless unmonitored?
     return unless state_reason.to_s.include?('flapping') # TODO: remove hackety
 
-    schedule :start, "retry start after flapping"
+    schedule :start, Eye::Reason.new(:'retry start after flapping')
     @retry_times += 1
   end
 

data/lib/eye/process/watchers.rb

@@ -62,7 +62,7 @@ private
       
       action = subject.fire || :restart
       notify :warn, "Bounded #{subject.check_name}: #{subject.last_human_values} send to :#{action}"
-      schedule action, "bounded #{subject.check_name}"
+      schedule action, Eye::Reason.new("bounded #{subject.check_name}")
     end
   end
 

data/lib/eye/reason.rb

@@ -0,0 +1,20 @@
+class Eye::Reason
+
+  def initialize(mes = nil)
+    @message = mes
+  end
+
+  def to_s
+    @message.to_s
+  end
+
+  def user?
+    self.class == User
+  end
+
+  class User < Eye::Reason
+    def to_s
+      "#{super} by user"
+    end
+  end
+end

data/lib/eye/settings.rb

@@ -1,15 +1,26 @@
 require 'fileutils'
 
 module Eye::Settings
-
   module_function
   
   def dir
     if Process::UID.eid == 0 # root
       '/var/run/eye'
     else
-      File.expand_path(File.join(ENV['EYE_HOME'] || ENV['HOME'], '.eye'))
-    end    
+      File.expand_path(File.join(home, '.eye'))
+    end
+  end
+
+  def eyeconfig
+    if Process::UID.eid == 0 # root
+      '/etc/eye.conf'
+    else
+      File.expand_path(File.join(home, '.eyeconfig'))
+    end
+  end
+
+  def home
+    ENV['EYE_HOME'] || ENV['HOME']
   end
   
   def path(path)

data/lib/eye/utils/celluloid_chain.rb

@@ -11,13 +11,23 @@ class Eye::Utils::CelluloidChain
 
   def add(method_name, *args, &block)
     @calls << {:method_name => method_name, :args => args, :block => block}
-    async.process unless @running
+    ensure_process
   end
 
   def add_wo_dups(method_name, *args, &block)
     h = {:method_name => method_name, :args => args, :block => block}
-    @calls << h if @calls[-1] != h
-    async.process unless @running
+    if @calls[-1] != h
+      @calls << h
+      ensure_process
+    end
+  end
+
+  def add_wo_dups_current(method_name, *args, &block)
+    h = {:method_name => method_name, :args => args, :block => block}
+    if !@calls.include?(h) && @call != h
+      @calls << h
+      ensure_process
+    end
   end
 
   def list
@@ -43,10 +53,17 @@ class Eye::Utils::CelluloidChain
 
 private
 
+  def ensure_process
+    unless @running
+      @running = true
+      async.process
+    end
+  end
+
   def process
-    while call = @calls.shift
+    while @call = @calls.shift
       @running = true
-      @target.send(call[:method_name], *call[:args], &call[:block]) if @target.alive?
+      @target.send(@call[:method_name], *@call[:args], &@call[:block]) if @target.alive?
     end
     @running = false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -276,11 +276,13 @@ files:
 - lib/eye/checker/socket.rb
 - lib/eye/child_process.rb
 - lib/eye/client.rb
+- lib/eye/config.rb
 - lib/eye/control.rb
 - lib/eye/controller.rb
 - lib/eye/controller/commands.rb
 - lib/eye/controller/helpers.rb
 - lib/eye/controller/load.rb
+- lib/eye/controller/options.rb
 - lib/eye/controller/send_command.rb
 - lib/eye/controller/show_history.rb
 - lib/eye/controller/status.rb
@@ -295,7 +297,6 @@ files:
 - lib/eye/dsl/opts.rb
 - lib/eye/dsl/process_opts.rb
 - lib/eye/dsl/pure_opts.rb
-- lib/eye/dsl/validate.rb
 - lib/eye/dsl/validation.rb
 - lib/eye/group.rb
 - lib/eye/group/chain.rb
@@ -319,6 +320,7 @@ files:
 - lib/eye/process/trigger.rb
 - lib/eye/process/validate.rb
 - lib/eye/process/watchers.rb
+- lib/eye/reason.rb
 - lib/eye/server.rb
 - lib/eye/settings.rb
 - lib/eye/system.rb

data/lib/eye/dsl/validate.rb

@@ -1,46 +0,0 @@
-module Eye::Dsl::Validate
-
-  # validate global config rules
-  def validate(config)
-    cfg = config[:config]
-    config = config[:applications]
-
-    all_processes = config.values.map{|e| (e[:groups] || {}).values.map{|c| (c[:processes] || {}).values} }.flatten
-
-    # Check blank pid_files
-    
-    no_pid_file = all_processes.select{|c| c[:pid_file].blank? }
-    if no_pid_file.present?
-      raise Eye::Dsl::Error, "blank pid_file for: #{no_pid_file.map{|c| c[:name]} * ', '}"
-    end
-
-    # Check dublicates of the full pid_file
-
-    dubl_pids = all_processes.each_with_object(Hash.new(0)) do |o, h| 
-      ex_pid_file = Eye::System.normalized_file(o[:pid_file], o[:working_dir])
-      h[ex_pid_file] += 1
-    end
-    dubl_pids = dubl_pids.select{|k,v| v>1}
-
-    if dubl_pids.present?
-      raise Eye::Dsl::Error, "dublicate pid_files: #{dubl_pids.inspect}"
-    end
-
-    # Check dublicates of the full_name
-    dubl_names = all_processes.each_with_object(Hash.new(0)) do |o, h| 
-      full_name = "#{o[:application]}:#{o[:group]}:#{o[:name]}"
-      h[full_name] += 1
-    end
-    dubl_names = dubl_names.select{|k,v| v>1}
-
-    if dubl_names.present?
-      raise Eye::Dsl::Error, "dublicate names: #{dubl_names.inspect}"
-    end
-
-    # validate processes with their own validate
-    all_processes.each do |process_cfg|
-      Eye::Process.validate process_cfg
-    end
-  end
-
-end