eye 0.3.2 → 0.4

data/lib/eye/dsl.rb

@@ -27,13 +27,13 @@ class Eye::Dsl
     def parse(content = nil, filename = nil)
       Eye.parsed_config = Eye::Config.new
       Eye.parsed_filename = filename
-      
+
       content = File.read(filename) if content.blank?
-      
+
       silence_warnings do
         Kernel.eval(content, Eye::BINDING, filename.to_s)
       end
-      
+
       Eye.parsed_config.validate!
       Eye.parsed_config
     end

data/lib/eye/dsl/application_opts.rb

@@ -10,11 +10,11 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     [:groups]
   end
 
-  def group(name, &block) 
+  def group(name, &block)
     Eye::Dsl.debug "=> group #{name}"
-    
+
     opts = Eye::Dsl::GroupOpts.new(name, self)
-    opts.instance_eval(&block)    
+    opts.instance_eval(&block)
     if cfg = opts.config
       @config[:groups] ||= {}
 
@@ -22,7 +22,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
       @config[:groups][name.to_s] ||= {}
       @config[:groups][name.to_s].merge!(cfg)
       @config[:groups][name.to_s][:processes] ||= {}
-      @config[:groups][name.to_s][:processes].merge!(processes)      
+      @config[:groups][name.to_s][:processes].merge!(processes)
     end
 
     Eye::Dsl.debug "<= group #{name}"

data/lib/eye/dsl/config_opts.rb

@@ -3,7 +3,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
   create_options_methods([:logger], String)
   create_options_methods([:logger_level], Fixnum)
   create_options_methods([:http], Hash)
-  
+
   def set_logger(logger)
     logger.blank? ? super('') : super
   end
@@ -21,7 +21,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
   end
 
   def contact(contact_name, contact_type, contact, contact_opts = {})
-    raise Eye::Dsl::Error, "unknown contact_type #{contact_type}" unless Eye::Notify::TYPES[contact_type]    
+    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.settings[contact_type] || {}
@@ -30,7 +30,7 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     Eye::Notify.validate!(validate_hash)
 
     @config[:contacts] ||= {}
-    @config[:contacts][contact_name.to_s] = {name: contact_name.to_s, type: contact_type, 
+    @config[:contacts][contact_name.to_s] = {name: contact_name.to_s, type: contact_type,
       contact: contact, opts: contact_opts}
   end
 
@@ -44,5 +44,5 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
       @config[:contacts].merge!(cfg[:contacts])
     end
   end
-  
+
 end

data/lib/eye/dsl/helpers.rb

@@ -1,5 +1,5 @@
 
-# Dsl Helpers 
+# Dsl Helpers
 
 # current eye parsed config path
 def current_config_path
@@ -8,5 +8,5 @@ end
 
 # host name
 def hostname
-  Eye::System.host  
+  Eye::System.host
 end

data/lib/eye/dsl/main.rb

@@ -2,7 +2,7 @@ module Eye::Dsl::Main
   attr_accessor :parsed_config, :parsed_filename
 
   def application(name, &block)
-    Eye::Dsl.debug "=> app: #{name}"    
+    Eye::Dsl.debug "=> app: #{name}"
     opts = Eye::Dsl::ApplicationOpts.new(name)
     opts.instance_eval(&block)
 
@@ -36,5 +36,5 @@ module Eye::Dsl::Main
 
     Eye::Dsl.debug "<= config"
   end
-  
+
 end

data/lib/eye/dsl/opts.rb

@@ -1,14 +1,14 @@
 class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
-  STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :start_command, 
+  STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :start_command,
     :stop_command, :restart_command, :uid, :gid ]
   create_options_methods(STR_OPTIONS, String)
 
-  BOOL_OPTIONS = [ :daemonize, :keep_alive, :control_pid, :auto_start, :stop_on_delete]
+  BOOL_OPTIONS = [ :daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid ]
   create_options_methods(BOOL_OPTIONS, [TrueClass, FalseClass])
 
   INTERVAL_OPTIONS = [ :check_alive_period, :start_timeout, :restart_timeout, :stop_timeout, :start_grace,
-    :restart_grace, :stop_grace, :childs_update_period ]
+    :restart_grace, :stop_grace, :childs_update_period, :restore_in ]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
   create_options_methods([:environment], Hash)
@@ -32,20 +32,20 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
     opts.merge!(:type => nac[:type])
     Eye::Checker.validate!(opts)
-    
+
     @config[:checks] ||= {}
     @config[:checks][nac[:name]] = opts
   end
 
   def triggers(type, opts = {})
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown trigger type #{type}" unless Eye::Trigger::TYPES[type]
-    
-    opts.merge!(:type => type)
+    nac = Eye::Trigger.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown trigger type #{type}" unless nac
+
+    opts.merge!(:type => nac[:type])
     Eye::Trigger.validate!(opts)
 
     @config[:triggers] ||= {}
-    @config[:triggers][type] = opts
+    @config[:triggers][nac[:name]] = opts
   end
 
   # clear checks from parent
@@ -57,14 +57,19 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   # clear triggers from parent
   def notriggers(type)
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown trigger type #{type}" unless Eye::Trigger::TYPES[type]
-    @config[:triggers].try :delete, type
+    nac = Eye::Trigger.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown trigger type #{type}" unless nac
+    @config[:triggers].try :delete, nac[:name]
   end
 
+  alias check checks
+  alias nocheck nochecks
+  alias trigger triggers
+  alias notrigger notriggers
+
   def notify(contact, level = :warn)
     unless Eye::Process::Notify::LEVELS[level]
-      raise Eye::Dsl::Error, "level should be in #{Eye::Process::Notify::LEVELS.keys}" 
+      raise Eye::Dsl::Error, "level should be in #{Eye::Process::Notify::LEVELS.keys}"
     end
 
     @config[:notify] ||= {}
@@ -125,7 +130,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   def with_server(glob = nil, &block)
     on_server = true
 
-    if glob.present? 
+    if glob.present?
       host = Eye::System.host
 
       if glob.is_a?(Array)

data/lib/eye/dsl/process_opts.rb

@@ -2,7 +2,7 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
 
   def monitor_children(&block)
     opts = Eye::Dsl::ChildProcessOpts.new
-    opts.instance_eval(&block)
+    opts.instance_eval(&block) if block
     @config[:monitor_children] ||= {}
     @config[:monitor_children].merge!(opts.config)
   end

data/lib/eye/dsl/pure_opts.rb

@@ -44,7 +44,7 @@ class Eye::Dsl::PureOpts
   attr_reader :config, :parent
 
   def initialize(name = nil, parent = nil, merge_parent_config = true)
-    @name = name.to_s    
+    @name = name.to_s
     @full_name = @name
 
     if parent
@@ -84,7 +84,7 @@ class Eye::Dsl::PureOpts
       self.class.with_parsed_file(proc) do |path|
         if File.exists?(path)
           Eye::Dsl.debug "=> load #{path}"
-          self.instance_eval(File.read(path)) 
+          self.instance_eval(File.read(path))
           Eye::Dsl.debug "<= load #{path}"
         end
       end

data/lib/eye/dsl/validation.rb

@@ -23,24 +23,26 @@ module Eye::Dsl::Validation
     defaults[param] = default
     variants[param] = _variants
 
+    return if param == :do
+
     define_method "#{param}" do
-      @options[param.to_sym] || default
+      @options[param] || default
     end
   end
 
-  def validate(options = {})    
-    options.each do |param, value|        
+  def validate(options = {})
+    options.each do |param, value|
       param = param.to_sym
       types = validates[param]
       unless types
         if param != :type
-          raise Error, "#{self.name} unknown param :#{param} value #{value.inspect}" 
+          raise Error, "#{self.name} unknown param :#{param} value #{value.inspect}"
         end
       end
 
       if self.variants[param]
         if value && !value.is_a?(Proc) && !self.variants[param].include?(value)
-          raise Error, "#{value.inspect} should within #{self.variants[param].inspect}" 
+          raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
         end
       end
 

data/lib/eye/group.rb

@@ -5,7 +5,6 @@ class Eye::Group
 
   autoload :Chain, 'eye/group/chain'
 
-  include Eye::Logger::Helpers
   include Eye::Process::Scheduler
   include Eye::Group::Chain
 
@@ -14,14 +13,21 @@ class Eye::Group
   def initialize(name, config)
     @name = name
     @config = config
-    @logger = Eye::Logger.new(full_name)
     @processes = Eye::Utils::AliveArray.new
     @hidden = (name == '__default__')
     debug 'created'
   end
 
+  def logger_tag
+    full_name
+  end
+
+  def app_name
+    @config[:application]
+  end
+
   def full_name
-    @full_name ||= "#{@config[:application]}:#{@name}"
+    @full_name ||= "#{app_name}:#{@name}"
   end
 
   def update_config(cfg)
@@ -47,14 +53,14 @@ class Eye::Group
 
     # show current chain
     if current_scheduled_command
-      h.update(current_command: current_scheduled_command) 
+      h.update(current_command: current_scheduled_command)
 
       if (chain_commands = scheduler_actions_list) && chain_commands.present?
-        h.update(chain_commands: chain_commands) 
+        h.update(chain_commands: chain_commands)
       end
 
       if @chain_processes_current && @chain_processes_count
-        h.update(chain_progress: [@chain_processes_current, @chain_processes_count]) 
+        h.update(chain_progress: [@chain_processes_current, @chain_processes_count])
       end
     end
 
@@ -71,9 +77,9 @@ class Eye::Group
     case command
       when :delete
         delete *args
-      when :break_chain 
+      when :break_chain
         break_chain *args
-      else 
+      else
         schedule command, *args, Eye::Reason::User.new(command)
     end
   end
@@ -110,7 +116,7 @@ class Eye::Group
   def break_chain
     info "break chain"
     scheduler_clear_pending_list
-    @chain_breaker = true    
+    @chain_breaker = true
   end
 
   def clear
@@ -125,10 +131,10 @@ private
 
   def async_schedule(command, *args)
     info "send to all processes #{command} #{args.present? ? args*',' : nil}"
-    
+
     @processes.each do |process|
       process.send_command(command, *args)
-    end    
+    end
   end
 
 end

data/lib/eye/group/chain.rb

@@ -17,7 +17,7 @@ private
       @chain_processes_current = @chain_processes_current.to_i + 1
 
       # to skip last sleep
-      break if @chain_processes_current.to_i == @chain_processes_count.to_i 
+      break if @chain_processes_current.to_i == @chain_processes_count.to_i
       break if @chain_breaker
 
       # wait next process
@@ -34,7 +34,7 @@ private
 
   def chain_schedule_process(process, type, command, *args)
     debug "chain_schedule_process #{process.name} #{type} #{command}"
-    
+
     if type == :sync
       # sync command, with waiting
       # this is very hackety, because call method of the process without its scheduler
@@ -73,7 +73,7 @@ private
 
       {:type => type, :grace => grace}
     else
-      # default chain case            
+      # default chain case
       {:type => :async, :grace => DEFAULT_CHAIN}
     end
   end

data/lib/eye/loader.rb

@@ -1,12 +1,14 @@
 # mini bundler, for embedded server gem installation
 
-gem 'celluloid',     '~> 0.13.0'
-gem 'celluloid-io',  '~> 0.13.0'
+gem 'celluloid',     '~> 0.14.0'
+gem 'celluloid-io',  '~> 0.14.0'
 gem 'nio4r'
 gem 'timers'
 
-gem 'state_machine', '< 1.2'
-gem 'activesupport', '~> 3.2.0'
+gem 'state_machine'
 
-gem 'i18n' # for as
-gem 'multi_json' # for as
+if RUBY_VERSION == '1.9.2'
+  gem 'activesupport', '>= 3', '< 4.0'
+else
+  gem 'activesupport', '>= 3'
+end

data/lib/eye/logger.rb

@@ -11,17 +11,26 @@ class Eye::Logger
 
       self.formatter = Proc.new do |s, d, p, m|
         "#{d.strftime(FORMAT)} #{s.ljust(5)} -- #{m}\n"
-      end      
+      end
     end
   end
 
-  module Helpers
-    attr_reader :logger
+  module ObjectExt
+    def logger_tag
+      [Class, Module].include?(self.class) ? to_s : "<#{self.class.to_s}>"
+    end
+
+    def logger_sub_tag
+    end
+
+    def logger
+      @logger ||= Eye::Logger.new(logger_tag, logger_sub_tag)
+    end
 
     Logger::Severity.constants.each do |level|
       method_name = level.to_s.downcase
       define_method method_name do |msg|
-        @logger.send(method_name, msg)
+        logger.send(method_name, msg)
       end
     end
   end
@@ -47,7 +56,7 @@ class Eye::Logger
 
       @dev_fd = STDOUT if @dev.to_s.downcase == 'stdout'
       @dev_fd = STDERR if @dev.to_s.downcase == 'stderr'
-      
+
       @inner_logger = InnerLogger.new(@dev_fd)
       @inner_logger.level = self.log_level || Logger::INFO
     end

data/lib/eye/notify.rb

@@ -1,6 +1,5 @@
 class Eye::Notify
   include Celluloid
-  include Eye::Logger::Helpers
   extend Eye::Dsl::Validation
 
   autoload :Mail,     'eye/notify/mail'
@@ -19,10 +18,14 @@ class Eye::Notify
   end
 
   def self.notify(contact, message_h)
+    contact = contact.to_s
     settings = Eye::Control.settings
-    needed_hash = (settings[:contacts] || {})[contact.to_s]
+    needed_hash = (settings[:contacts] || {})[contact]
 
-    return if needed_hash.blank?
+    if needed_hash.blank?
+      error "not found contact #{contact}! something wrong with config"
+      return
+    end
 
     create_proc = lambda do |nh|
       type = nh[:type]
@@ -42,11 +45,14 @@ class Eye::Notify
   TIMEOUT = 1.minute
 
   def initialize(options = {}, message_h = {})
-    @logger = Eye::Logger.new("#{self.class.name.downcase} - #{options[:contact]}")
-    debug "created notifier #{options}"
-
     @message_h = message_h
     @options = options
+
+    debug "created notifier #{options}"
+  end
+
+  def logger_sub_tag
+    @options[:contact]
   end
 
   def async_notify
@@ -70,7 +76,7 @@ class Eye::Notify
   def message_subject
     "[#{msg_host}] [#{msg_full_name}] #{msg_message}"
   end
-  
+
   def message_body
     "#{message_subject} at #{msg_at.to_s(:short)}"
   end