eye 0.5.1 → 0.5.2

data/lib/eye/process/states.rb

@@ -61,8 +61,8 @@ class Eye::Process
     after_transition any-:up => :up, :do => :add_watchers
     after_transition :up => any-:up, :do => :remove_watchers
 
-    after_transition any-:up => :up, :do => :add_childs
-    after_transition any => [:unmonitored, :down], :do => :remove_childs
+    after_transition any-:up => :up, :do => :add_children
+    after_transition any => [:unmonitored, :down], :do => :remove_children
 
     after_transition :on => :crashed, :do => :on_crashed
   end
@@ -80,4 +80,4 @@ class Eye::Process
     info "switch :#{transition.event} [:#{transition.from_name} => :#{transition.to_name}] #{@state_reason ? "(reason: #{@state_reason})" : nil}"
   end
 
-end
+end

data/lib/eye/process/system.rb

@@ -36,9 +36,9 @@ module Eye::Process::System
     File.ctime(self[:pid_file_ex]) rescue Time.now
   end
 
-  def process_realy_running?
+  def process_really_running?
     res = Eye::System.check_pid_alive(self.pid)
-    debug "process_realy_running?: (#{self.pid}) #{res.inspect}"
+    debug "process_really_running?: (#{self.pid}) #{res.inspect}"
     !!res[:result]
   end
 
@@ -90,4 +90,4 @@ module Eye::Process::System
     false
   end
 
-end
+end

data/lib/eye/process/validate.rb

@@ -12,7 +12,7 @@ module Eye::Process::Validate
 
       if config[:daemonize]
         if spl =~ %r[sh#\-c|#&&#|;#]
-          raise Error, "#{config[:name]}, start_command in daemonize not supported shell concats like '&&'"
+          raise Error, "#{config[:name]}, daemonize does not support concats like '&&' in start_command"
         end
       end
     end

data/lib/eye/process/watchers.rb

@@ -11,17 +11,17 @@ module Eye::Process::Watchers
         check_alive
       end
 
-      # monitor childs pids
+      # monitor children pids
       if self[:monitor_children]
-        add_watcher(:check_childs, self[:childs_update_period]) do
-          add_or_update_childs
+        add_watcher(:check_children, self[:children_update_period]) do
+          add_or_update_children
         end
       end
 
       # monitor conditional watchers
       start_checkers
     else
-      warn 'try add_watchers, but its already here'
+      warn 'add_watchers failed, watchers are already present'
     end
   end
 
@@ -35,7 +35,7 @@ private
   def add_watcher(type, period = 2, subject = nil, &block)
     return if @watchers[type]
 
-    debug "add watcher #{type}(#{period})"
+    debug "adding watcher: #{type}(#{period})"
 
     timer = every(period.to_f) do
       debug "check #{type}"
@@ -69,4 +69,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/server.rb

@@ -26,7 +26,7 @@ class Eye::Server
     begin
       command, *args = Marshal.load(text)
     rescue => ex
-      error "Failed socket read #{ex.message}"
+      error "Failed to read from socket: #{ex.message}"
       return
     end
 

data/lib/eye/system.rb

@@ -4,7 +4,7 @@ require 'etc'
 
 module Eye::System
   class << self
-    # Check that pid realy exits
+    # Check that pid really exits
     # very fast
     # return result hash
     def check_pid_alive(pid)
@@ -19,7 +19,7 @@ module Eye::System
       {:error => ex}
     end
 
-    # Check that pid realy exits
+    # Check that pid really exits
     # very fast
     # return true/false
     def pid_alive?(pid)
@@ -86,7 +86,7 @@ module Eye::System
 
     rescue Timeout::Error => ex
       if pid
-        warn "[#{cfg[:name]}] send signal 9 to #{pid} (because of timeouted<#{timeout}> execution)"
+        warn "[#{cfg[:name]}] sending :KILL signal to <#{pid}> due to timeout (#{timeout}s)"
         send_signal(pid, 9)
       end
       {:error => ex}
@@ -132,4 +132,4 @@ module Eye::System
     end
   end
 
-end
+end

data/lib/eye/system_resources.rb

@@ -15,8 +15,8 @@ class Eye::SystemResources
       end
     end
 
-    def childs(parent_pid)
-      cache.childs(parent_pid)
+    def children(parent_pid)
+      cache.children(parent_pid)
     end
 
     def start_time(pid) # unixtime
@@ -79,7 +79,7 @@ class Eye::SystemResources
     rescue ArgumentError # when incorrect PID
     end
 
-    def childs(pid)
+    def children(pid)
       if pid
         @ppids[pid] ||= Eye::Sigar.proc_list("State.Ppid.eq=#{pid}")
       else

data/lib/eye/trigger.rb

@@ -3,11 +3,9 @@ class Eye::Trigger
 
   autoload :Flapping,   'eye/trigger/flapping'
   autoload :Transition, 'eye/trigger/transition'
-  autoload :StopChilds, 'eye/trigger/stop_childs'
+  autoload :StopChildren, 'eye/trigger/stop_children'
 
-  # ex: { :type => :flapping, :times => 2, :within => 30.seconds}
-
-  TYPES = {:flapping => 'Flapping', :transition => 'Transition', :stop_childs => 'StopChilds'}
+  TYPES = {:flapping => 'Flapping', :transition => 'Transition', :stop_children => 'StopChildren'}
 
   attr_reader :message, :options, :process
 
@@ -23,7 +21,7 @@ class Eye::Trigger
 
   def self.get_class(type)
     klass = eval("Eye::Trigger::#{TYPES[type]}") rescue nil
-    raise "Unknown trigger #{type}" unless klass
+    raise "unknown trigger #{type}" unless klass
     if deps = klass.depends_on
       Array(deps).each { |d| require d }
     end
@@ -86,7 +84,7 @@ class Eye::Trigger
   end
 
   def check(transition)
-    raise 'realize me'
+    raise NotImplementedError
   end
 
   def run_in_process_context(p)

data/lib/eye/trigger/flapping.rb

@@ -1,7 +1,7 @@
 class Eye::Trigger::Flapping < Eye::Trigger
 
-  # triggers :flapping, :times => 10, :within => 1.minute,
-  #          :retry_in => 10.minutes, :retry_times => 15
+  # trigger :flapping, :times => 10, :within => 1.minute,
+  #         :retry_in => 10.minutes, :retry_times => 15
 
   param :times, [Fixnum], true, 5
   param :within, [Float, Fixnum], true

data/lib/eye/trigger/stop_children.rb

@@ -0,0 +1,14 @@
+class Eye::Trigger::StopChildren < Eye::Trigger
+
+  # Kill process children when parent process crashed, or stopped:
+  #
+  # trigger :stop_children, :event => [:stopped, :crashed]
+
+  param :timeout, [Fixnum, Float], nil, 60
+
+  def check(trans)
+    debug 'stopping children'
+    process.children.pmap { |pid, c| c.stop }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -343,7 +343,7 @@ files:
 - lib/eye/notify/jabber.rb
 - lib/eye/notify/mail.rb
 - lib/eye/process.rb
-- lib/eye/process/child.rb
+- lib/eye/process/children.rb
 - lib/eye/process/commands.rb
 - lib/eye/process/config.rb
 - lib/eye/process/controller.rb
@@ -364,7 +364,7 @@ files:
 - lib/eye/system_resources.rb
 - lib/eye/trigger.rb
 - lib/eye/trigger/flapping.rb
-- lib/eye/trigger/stop_childs.rb
+- lib/eye/trigger/stop_children.rb
 - lib/eye/trigger/transition.rb
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb

data/lib/eye/process/child.rb

@@ -1,60 +0,0 @@
-module Eye::Process::Child
-
-  def add_childs
-    add_or_update_childs
-  end
-
-  def add_or_update_childs
-    return unless self[:monitor_children]
-    return unless self.up?
-    return if @updating_childs
-    @updating_childs = true
-
-    unless self.pid
-      warn 'Cant add childs, because no pid'
-      return
-    end
-
-    now_childs = Eye::SystemResources.childs(self.pid)
-    new_childs = []
-    exist_childs = []
-
-    now_childs.each do |child_pid|
-      if self.childs[child_pid]
-        exist_childs << child_pid
-      else
-        new_childs << child_pid
-      end
-    end
-
-    removed_childs = self.childs.keys - now_childs
-
-    if new_childs.present?
-      new_childs.each do |child_pid|
-        self.childs[child_pid] = Eye::ChildProcess.new(child_pid, self[:monitor_children], logger.prefix)
-      end
-    end
-
-    if removed_childs.present?
-      removed_childs.each{|child_pid| remove_child(child_pid) }
-    end
-
-    h = {:new => new_childs.size, :removed => removed_childs.size, :exists => exist_childs.size }
-    debug "childs info: #{ h.inspect }"
-
-    @updating_childs = false
-    h
-  end
-
-  def remove_childs
-    if childs.present?
-      childs.keys.each{|child_pid| remove_child(child_pid) }
-    end
-  end
-
-  def remove_child(child_pid)
-    child = self.childs.delete(child_pid)
-    child.destroy if child && child.alive?
-  end
-
-end

data/lib/eye/trigger/stop_childs.rb

@@ -1,10 +0,0 @@
-class Eye::Trigger::StopChilds < Eye::Trigger
-
-  param :timeout, [Fixnum, Float], nil, 60
-
-  def check(trans)
-    debug 'stop childs'
-    process.childs.pmap { |pid, c| c.stop }
-  end
-
-end