eye 0.5.1 → 0.5.2

data/lib/eye/checker/http.rb

@@ -2,7 +2,7 @@ require 'net/http'
 
 class Eye::Checker::Http < Eye::Checker::Defer
 
-  # checks :http, :every => 5.seconds, :times => 1,
+  # check :http, :every => 5.seconds, :times => 1,
   #  :url => "http://127.0.0.1:3000/", :kind => :success, :pattern => /OK/, :timeout => 3.seconds
 
   param :url,           String, true
@@ -93,4 +93,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/checker/memory.rb

@@ -1,11 +1,9 @@
-class Eye::Checker::Memory < Eye::Checker
+class Eye::Checker::Memory < Eye::Checker::Measure
 
-  # checks :memory, :every => 3.seconds, :below => 80.megabytes, :times => [3,5]
-
-  param :below, [Fixnum, Float], true
+  # check :memory, :every => 3.seconds, :below => 80.megabytes, :times => [3,5]
 
   def check_name
-    @check_name ||= "memory(#{human_value(below)})"
+    @check_name ||= "memory(#{measure_str})"
   end
 
   def get_value
@@ -16,12 +14,4 @@ class Eye::Checker::Memory < Eye::Checker
     "#{value.to_i / 1024 / 1024}Mb"
   end
 
-  def good?(value)
-    if below
-      value < below
-    else
-      true
-    end
-  end
-
-end
+end

data/lib/eye/checker/runtime.rb

@@ -1,9 +1,7 @@
-class Eye::Checker::Runtime < Eye::Checker
+class Eye::Checker::Runtime < Eye::Checker::Measure
 
   # check :runtime, :every => 1.minute, :below => 120.minutes
 
-  param :below, [Fixnum, Float], true
-
   def get_value
     st = Eye::SystemResources.start_time(@pid)
     if st
@@ -17,12 +15,4 @@ class Eye::Checker::Runtime < Eye::Checker
     "#{value / 60}m"
   end
 
-  def good?(value)
-    if below
-      value < below
-    else
-      true
-    end
-  end
-
-end
+end

data/lib/eye/checker/socket.rb

@@ -1,6 +1,6 @@
 class Eye::Checker::Socket < Eye::Checker::Defer
 
-  # checks :socket, :every => 5.seconds, :times => 1,
+  # check :socket, :every => 5.seconds, :times => 1,
   #  :addr => "unix:/var/run/daemon.sock", :timeout => 3.seconds,
   #
   # Available parameters:

data/lib/eye/cli.rb

@@ -13,6 +13,9 @@ class Eye::Cli < Thor
   desc "info [MASK]", "processes info"
   def info(mask = nil)
     res = cmd(:info_data, *Array(mask))
+    if mask && res[:subtree] && res[:subtree].empty?
+      error!("command :info, objects not found!")
+    end
     say render_info(res)
     say
   end
@@ -41,6 +44,9 @@ class Eye::Cli < Thor
   desc "history [MASK,...]", "processes history"
   def history(*masks)
     res = cmd(:history_data, *masks)
+    if !masks.empty? && res && res.empty?
+      error!("command :history, objects not found!")
+    end
     say render_history(res)
     say
   end

data/lib/eye/cli/commands.rb

@@ -15,9 +15,9 @@ private
     res = _cmd(cmd, *args)
 
     if res == :not_started
-      error! "socket(#{Eye::Local.socket_path}) not found, did you `eye load`?"
+      error! "socket(#{Eye::Local.socket_path}) not found, did you run `eye load`?"
     elsif res == :timeouted
-      error! 'eye does not answer, timeouted...'
+      error! 'eye timed out without responding...'
     end
 
     res
@@ -26,7 +26,6 @@ private
   def say_load_result(res = {}, opts = {})
     error!(res) unless res.is_a?(Hash)
     say_filename = (res.size > 1)
-    say 'eye started!', :green if opts[:started]
     error = false
     res.each do |filename, _res|
       say "#{filename}: ", nil, true if say_filename

data/lib/eye/cli/render.rb

@@ -1,7 +1,7 @@
 module Eye::Cli::Render
 private
   def render_info(data)
-    error!("unexpected server answer #{data.inspect}") unless data.is_a?(Hash)
+    error!("unexpected server response #{data.inspect}") unless data.is_a?(Hash)
 
     make_str data
   end
@@ -62,7 +62,7 @@ private
   end
 
   def render_debug_info(data)
-    error!("unexpected server answer #{data.inspect}") unless data.is_a?(Hash)
+    error!("unexpected server response #{data.inspect}") unless data.is_a?(Hash)
 
     s = ""
 
@@ -90,7 +90,7 @@ private
   end
 
   def render_history(data)
-    error!("unexpected server answer #{data.inspect}") unless data.is_a?(Hash)
+    error!("unexpected server response #{data.inspect}") unless data.is_a?(Hash)
 
     res = []
     data.each do |name, data|
@@ -103,7 +103,7 @@ private
   def detail_process_info(name, history)
     return if history.empty?
 
-    res = "\033[1m#{name}\033[0m:\n"
+    res = "\033[1m#{name}\033[0m\n"
     history = history.reverse
 
     history.chunk{|h| [h[:state], h[:reason].to_s] }.each do |_, hist|

data/lib/eye/cli/server.rb

@@ -51,15 +51,15 @@ private
     File.open(Eye::Local.pid_path, 'w'){|f| f.write(pid) }
 
     unless wait_server
-      error! 'server not runned in 15 seconds, something crazy wrong'
+      error! 'server has not started in 15 seconds, something is very wrong'
     end
 
     configs.unshift(Eye::Local.eyeconfig) if File.exists?(Eye::Local.eyeconfig)
 
+    say 'eye started!', :green
+
     if !configs.empty?
-      say_load_result cmd(:load, *configs), :started => true
-    else
-      say 'started!', :green
+      say_load_result cmd(:load, *configs)
     end
   end
 

data/lib/eye/controller.rb

@@ -40,7 +40,7 @@ class Eye::Controller
     Celluloid::logger = Eye::Logger.new('celluloid')
     Eye::SystemResources.cache
 
-    info "starting #{Eye::ABOUT} (#{$$})"
+    info "starting #{Eye::ABOUT} <#{$$}>"
   end
 
   def settings

data/lib/eye/controller/load.rb

@@ -11,7 +11,7 @@ module Eye::Controller::Load
   def load(*args)
     h = args.extract_options!
     obj_strs = args.flatten
-    info "load: #{obj_strs}"
+    info "loading: #{obj_strs}"
 
     res = Hash.new
 
@@ -42,7 +42,7 @@ private
   rescue Eye::Dsl::Error, Exception, NoMethodError => ex
     raise if ex.class.to_s.include?('RR') # skip RR exceptions
 
-    error "load: config error <#{filename}>: #{ex.message}"
+    error "loading: config error <#{filename}>: #{ex.message}"
 
     # filter backtrace for user output
     bt = (ex.backtrace || [])
@@ -65,7 +65,7 @@ private
         filename
       end
 
-      debug "load: globbing mask #{mask}"
+      debug "loading: globbing mask #{mask}"
 
       sub = []
       Dir[mask].each do |config_path|
@@ -81,16 +81,17 @@ private
 
   # return: result, config
   def parse_config(filename)
-    debug "parse #{filename}"
+    debug "parsing: #{filename}"
 
     cfg = Eye::Dsl.parse(nil, filename)
     @current_config.merge(cfg).validate! # just validate summary config here
+    Eye.parsed_config = nil # remove link on config, for better gc
     cfg
   end
 
   # !!! exclusive operation
   def load_config(filename, config)
-    info "load #{filename}"
+    info "loading: #{filename}"
     new_cfg = @current_config.merge(config)
     new_cfg.validate!
 
@@ -111,7 +112,7 @@ private
 
   # create objects as diff, from configs
   def create_objects(apps_config, changed_apps = [])
-    debug 'create objects'
+    debug 'creating objects'
 
     apps_config.each do |app_name, app_cfg|
       update_or_create_application(app_name, app_cfg.clone) if changed_apps.include?(app_name)
@@ -137,9 +138,9 @@ private
 
       @applications.delete(app)
 
-      debug "update app #{app_name}"
+      debug "updating app: #{app_name}"
     else
-      debug "create app #{app_name}"
+      debug "creating app: #{app_name}"
     end
 
     app = Eye::Application.new(app_name, app_config)
@@ -182,13 +183,13 @@ private
 
   def update_or_create_group(group_name, group_config)
     group = if @old_groups[group_name]
-      debug "update group #{group_name}"
+      debug "updating group: #{group_name}"
       group = @old_groups.delete(group_name)
       group.schedule :update_config, group_config, Eye::Reason::User.new(:'load config')
       group.clear
       group
     else
-      debug "create group #{group_name}"
+      debug "creating group: #{group_name}"
       gr = Eye::Group.new(group_name, group_config)
       @added_groups << gr
       gr
@@ -209,16 +210,16 @@ private
     key = @old_processes[name] ? name : @old_processes.keys.detect { |n| n.end_with?(postfix) }
 
     if @old_processes[key]
-      debug "update process #{name}"
+      debug "updating process: #{name}"
       process = @old_processes.delete(key)
       process.schedule :update_config, process_cfg, Eye::Reason::User.new(:'load config')
       process
     else
-      debug "create process #{name}"
+      debug "creating process: #{name}"
       process = Eye::Process.new(process_cfg)
       @added_processes << process
       process
     end
   end
 
-end
+end

data/lib/eye/controller/send_command.rb

@@ -124,7 +124,7 @@ private
       return apps if apps.size > 0
 
       if objs.map(&:app_name).uniq.size > 1
-        raise Error, "cant match targets from different applications: #{res.map(&:full_name)}"
+        raise Error, "cannot match targets from different applications: #{res.map(&:full_name)}"
       end
     end
 
@@ -150,9 +150,9 @@ private
           res << p if p.name =~ r || p.full_name =~ r
 
           # child matching
-          if p.childs.present?
-            childs = p.childs.values
-            res += childs.select do |ch|
+          if p.children.present?
+            children = p.children.values
+            res += children.select do |ch|
               name = ch.name rescue ''
               full_name = ch.full_name rescue ''
               name =~ r || full_name =~ r

data/lib/eye/controller/status.rb

@@ -59,8 +59,9 @@ private
     args = ['*'] if args.empty?
     res = []
     matched_objects(*args) do |obj|
-      if (obj.is_a?(Eye::Process) || obj.is_a?(Eye::ChildProcess))
+      if obj.is_a?(Eye::Process)
         res << obj
+      elsif obj.is_a?(Eye::ChildProcess)
       else
         res += obj.processes.to_a
       end

data/lib/eye/dsl.rb

@@ -43,7 +43,7 @@ class Eye::Dsl
     end
 
     def check_name(name)
-      raise Error, "not allow ':' in name '#{name}'" if name.to_s.include?(':')
+      raise Error, "':' is not allowed in name '#{name}'" if name.to_s.include?(':')
     end
   end
 end

data/lib/eye/dsl/child_process_opts.rb

@@ -1,12 +1,12 @@
 class Eye::Dsl::ChildProcessOpts < Eye::Dsl::Opts
 
   def allow_options
-    [:stop_command, :restart_command, :childs_update_period,
+    [:stop_command, :restart_command, :children_update_period,
       :stop_signals, :stop_grace, :stop_timeout, :restart_timeout]
   end
 
   def triggers(*args)
-    raise Eye::Dsl::Error, 'triggers does not allowed in monitor_children'
+    raise Eye::Dsl::Error, 'triggers not allowed in monitor_children'
   end
   alias trigger triggers
 

data/lib/eye/dsl/opts.rb

@@ -8,7 +8,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   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, :restore_in ]
+    :restart_grace, :stop_grace, :children_update_period, :restore_in ]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
   create_options_methods([:environment], Hash)
@@ -111,6 +111,10 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     set_daemonize true
   end
 
+  def clear_bundler_env
+    env('GEM_PATH' => nil, 'GEM_HOME' => nil, 'RUBYOPT' => nil, 'BUNDLE_BIN_PATH' => nil, 'BUNDLE_GEMFILE' => nil)
+  end
+
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)

data/lib/eye/dsl/validation.rb

@@ -49,10 +49,10 @@ module Eye::Dsl::Validation
           if value && !value.is_a?(Proc)
             if value.is_a?(Array)
               if (value - self.variants[param]).present?
-                raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
+                raise Error, "#{value.inspect} should be within #{self.variants[param].inspect}"
               end
             elsif !self.variants[param].include?(value)
-              raise Error, "#{value.inspect} should within #{self.variants[param].inspect}"
+              raise Error, "#{value.inspect} should be within #{self.variants[param].inspect}"
             end
           end
         end

data/lib/eye/group/chain.rb

@@ -3,7 +3,7 @@ module Eye::Group::Chain
 private
 
   def chain_schedule(type, grace, command, *args)
-    info "start #{type} with #{grace}s chain #{command} #{args}"
+    info "starting #{type} with #{grace}s chain #{command} #{args}"
 
     @chain_processes_count = @processes.size
     @chain_processes_current = 0
@@ -78,4 +78,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/notify.rb

@@ -9,7 +9,7 @@ class Eye::Notify
 
   def self.get_class(type)
     klass = eval("Eye::Notify::#{TYPES[type]}") rescue nil
-    raise "Unknown notify #{type}" unless klass
+    raise "unknown notifier :#{type}" unless klass
     if deps = klass.depends_on
       Array(deps).each { |d| require d }
     end
@@ -26,7 +26,7 @@ class Eye::Notify
     needed_hash = (settings[:contacts] || {})[contact]
 
     if needed_hash.blank?
-      error "not found contact #{contact}! something wrong with config"
+      error "contact #{contact} not found; check your configuration"
       return
     end
 
@@ -74,7 +74,7 @@ class Eye::Notify
   end
 
   def execute
-    raise 'realize me'
+    raise NotImplementedError
   end
 
   param :contact, [String]

data/lib/eye/process.rb

@@ -11,22 +11,22 @@ class Eye::Process
   autoload :System,           'eye/process/system'
   autoload :Controller,       'eye/process/controller'
   autoload :StatesHistory,    'eye/process/states_history'
-  autoload :Child,            'eye/process/child'
+  autoload :Children,         'eye/process/children'
   autoload :Trigger,          'eye/process/trigger'
   autoload :Notify,           'eye/process/notify'
   autoload :Scheduler,        'eye/process/scheduler'
   autoload :Validate,         'eye/process/validate'
 
   attr_accessor :pid, :watchers, :config, :states_history,
-                :childs, :triggers, :name, :state_reason, :flapping_times
+                :children, :triggers, :name, :state_reason, :flapping_times
 
   def initialize(config)
-    raise 'pid file should be' unless config[:pid_file]
+    raise 'you must supply a pid_file location' unless config[:pid_file]
 
     @config = prepare_config(config)
 
     @watchers = {}
-    @childs = {}
+    @children = {}
     @triggers = []
     @name = @config[:name]
     @flapping_times = 0
@@ -34,7 +34,7 @@ class Eye::Process
     @states_history = Eye::Process::StatesHistory.new(100)
     @states_history << :unmonitored
 
-    debug "create with config: #{@config.inspect}"
+    debug "creating with config: #{@config.inspect}"
 
     add_triggers
 
@@ -63,8 +63,8 @@ class Eye::Process
   # system methods:
   include Eye::Process::System
 
-  # manage childs methods
-  include Eye::Process::Child
+  # manage child methods
+  include Eye::Process::Children
 
   # manage triggers methods
   include Eye::Process::Trigger