eye 0.3.2 → 0.4

data/lib/eye/process/notify.rb

@@ -13,7 +13,7 @@ module Eye::Process::Notify
 
     # send notifies
     if self[:notify].present?
-      message = {:message => msg, :name => name, 
+      message = {:message => msg, :name => name,
         :full_name => full_name, :pid => pid, :host => Eye::System.host, :level => level,
         :at => Time.now }
 

data/lib/eye/process/scheduler.rb

@@ -17,7 +17,7 @@ module Eye::Process::Scheduler
       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)  
+        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
@@ -57,7 +57,7 @@ module Eye::Process::Scheduler
   def scheduler_clear_pending_list
     scheduler.clear_pending_list
   end
-  
+
   def self.included(base)
     base.finalizer :remove_scheduler
   end
@@ -74,7 +74,7 @@ private
   def remove_scheduler
     @scheduler.terminate if @scheduler && @scheduler.alive?
   end
-  
+
   def scheduler
     @scheduler ||= Eye::Utils::CelluloidChain.new(current_actor)
   end

data/lib/eye/process/states.rb

@@ -1,4 +1,5 @@
 require 'state_machine'
+require 'state_machine/version'
 
 class Eye::Process
 
@@ -52,11 +53,17 @@ class Eye::Process
       transition any => :unmonitored
     end
 
-    after_transition any => :unmonitored, :do => :on_unmonitored
-    after_transition any-:up => :up, :do => :on_up
-    after_transition :up => any-:up, :do => :from_up
     after_transition any => any, :do => :log_transition
     after_transition any => any, :do => :check_triggers
+
+    after_transition any => :unmonitored, :do => :on_unmonitored
+
+    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 :on => :crashed, :do => :on_crashed
   end
 
@@ -68,16 +75,6 @@ class Eye::Process
     self.pid = nil
   end
 
-  def on_up
-    add_watchers
-    add_childs
-  end
-
-  def from_up
-    remove_watchers
-    remove_childs
-  end
-
   def log_transition(transition)
     @states_history.push transition.to_name, @state_reason
     info "switch :#{transition.event} [:#{transition.from_name} => :#{transition.to_name}] #{@state_reason ? "(reason: #{@state_reason})" : nil}"

data/lib/eye/process/states_history.rb

@@ -40,19 +40,19 @@ class Eye::Process::StatesHistory < Eye::Utils::Tail
   end
 
   def any?(*seq)
-    states.any? do |st|      
+    states.any? do |st|
       seq.flatten.include?(st)
     end
   end
 
   def noone?(*seq)
-    !states.all? do |st|      
+    !states.all? do |st|
       seq.flatten.include?(st)
     end
   end
 
   def all?(*seq)
-    states.all? do |st|      
+    states.all? do |st|
       seq.flatten.include?(st)
     end
   end

data/lib/eye/process/system.rb

@@ -2,9 +2,9 @@ require 'timeout'
 
 module Eye::Process::System
 
-  def load_pid_from_file    
+  def load_pid_from_file
     if File.exists?(self[:pid_file_ex])
-      _pid = File.read(self[:pid_file_ex]).to_i 
+      _pid = File.read(self[:pid_file_ex]).to_i
       _pid > 0 ? _pid : nil
     end
   end
@@ -25,9 +25,10 @@ module Eye::Process::System
   end
 
   def clear_pid_file
+    info "delete pid_file: #{self[:pid_file_ex]}"
     File.unlink(self[:pid_file_ex])
     true
-  rescue 
+  rescue
     nil
   end
 
@@ -51,9 +52,18 @@ module Eye::Process::System
     res[:result] == :ok
   end
 
-  # non blocking actor timeout
   def wait_for_condition(timeout, step = 0.1, &block)
-    defer{ wait_for_condition_sync(timeout, step, &block) }
+    res = nil
+    sumtime = 0
+
+    loop do
+      tm = Time.now
+      res = yield # note that yield can block actor here and timeout can be overhead
+      return res if res
+      sleep step.to_f
+      sumtime += (Time.now - tm)
+      return false if sumtime > timeout
+    end
   end
 
   def execute(cmd, cfg = {})
@@ -63,7 +73,7 @@ module Eye::Process::System
   def failsafe_load_pid
     pid = load_pid_from_file
 
-    if !pid 
+    if !pid
       # this is can be symlink changed case
       sleep 0.1
       pid = load_pid_from_file
@@ -73,25 +83,11 @@ module Eye::Process::System
   end
 
   def failsafe_save_pid
-    save_pid_to_file 
+    save_pid_to_file
     true
   rescue => ex
     error "failsafe_save_pid: #{ex.message}"
     false
   end
 
-private
-
-  def wait_for_condition_sync(timeout, step, &block)
-    res = nil
-
-    Timeout::timeout(timeout.to_f) do
-      sleep step.to_f until res = yield
-    end
-
-    res
-  rescue Timeout::Error
-    false
-  end
-
 end

data/lib/eye/process/trigger.rb

@@ -4,7 +4,7 @@ module Eye::Process::Trigger
     if self[:triggers]
       self[:triggers].each do |type, cfg|
         add_trigger(cfg)
-      end      
+      end
     end
   end
 
@@ -12,43 +12,24 @@ module Eye::Process::Trigger
     self.triggers = []
   end
 
-  def check_triggers
+  def check_triggers(transition)
     return if unmonitored?
+    self.triggers.each { |trigger| trigger.notify(transition) }
+  end
 
-    self.triggers.each do |trigger|
-      unless trigger.check(self.states_history)
-        on_flapping(trigger) if trigger.class == Eye::Trigger::Flapping
-      end
-    end
+  def retry_start_after_flapping
+    return unless unmonitored?
+    return unless state_reason.to_s.include?('flapping') # TODO: remove hackety
+
+    schedule :start, Eye::Reason.new(:'retry start after flapping')
+    self.flapping_times += 1
   end
 
 private
 
   def add_trigger(cfg = {})
-    trigger = Eye::Trigger.create(cfg, logger.prefix)
+    trigger = Eye::Trigger.create(current_actor, cfg)
     self.triggers << trigger
   end
 
-  def on_flapping(trigger)
-    notify :error, 'flapping!'
-    schedule :unmonitor, Eye::Reason.new(:flapping)
-
-    @retry_times ||= 0
-    retry_in = trigger.retry_in
-
-    return unless retry_in
-    return if trigger.retry_times && @retry_times >= trigger.retry_times
-
-    schedule_in(retry_in.to_f, :retry_action)
-  end
-
-  def retry_action
-    debug "trigger retry timer"
-    return unless unmonitored?
-    return unless state_reason.to_s.include?('flapping') # TODO: remove hackety
-
-    schedule :start, Eye::Reason.new(:'retry start after flapping')
-    @retry_times += 1
-  end
-
 end

data/lib/eye/process/watchers.rb

@@ -7,13 +7,13 @@ module Eye::Process::Watchers
 
     if @watchers.blank?
       # default watcher :check_alive
-      add_watcher(:check_alive, self[:check_alive_period]) do 
+      add_watcher(:check_alive, self[:check_alive_period]) do
         check_alive
       end
 
       # monitor childs pids
       if self[:monitor_children]
-        add_watcher(:check_childs, self[:childs_update_period]) do 
+        add_watcher(:check_childs, self[:childs_update_period]) do
           add_or_update_childs
         end
       end
@@ -24,13 +24,13 @@ module Eye::Process::Watchers
       warn 'try add_watchers, but its already here'
     end
   end
-  
+
   def remove_watchers
     @watchers.each{|_, h| h[:timer].cancel }
     @watchers = {}
   end
 
-private  
+private
 
   def add_watcher(type, period = 2, subject = nil, &block)
     return if @watchers[type]
@@ -40,17 +40,17 @@ private
     timer = every(period.to_f) do
       debug "check #{type}"
       block.call(subject)
-    end    
+    end
 
     @watchers[type] ||= {:timer => timer, :subject => subject}
-  end  
-  
+  end
+
   def start_checkers
     self[:checks].each{|name, cfg| start_checker(name, cfg) }
   end
 
   def start_checker(name, cfg)
-    subject = Eye::Checker.create(pid, cfg, logger.prefix)
+    subject = Eye::Checker.create(pid, cfg, current_actor)
 
     # ex: {:type => :memory, :every => 5.seconds, :below => 100.megabytes, :times => [3,5]}
     add_watcher("check_#{name}".to_sym, subject.every, subject, &method(:watcher_tick).to_proc)
@@ -59,7 +59,7 @@ private
   def watcher_tick(subject)
     unless subject.check
       return unless up?
-      
+
       action = subject.fire || :restart
       notify :warn, "Bounded #{subject.check_name}: #{subject.last_human_values} send to :#{action}"
       schedule action, Eye::Reason.new("bounded #{subject.check_name}")

data/lib/eye/server.rb

@@ -3,9 +3,9 @@ require 'celluloid/autostart'
 
 class Eye::Server
   include Celluloid::IO
-  
+
   attr_reader :socket_path, :server
-  
+
   def initialize(socket_path)
     @socket_path = socket_path
     @server = begin
@@ -21,14 +21,22 @@ class Eye::Server
   end
 
   def handle_connection(socket)
-    command, *args = socket.readline.strip.split('|')
+    text = socket.read
+
+    begin
+      command, *args = Marshal.load(text)
+    rescue => ex
+      error "Failed socket read #{ex.message}"
+      return
+    end
+
     response = command(command, *args)
     socket.write(Marshal.dump(response))
-    
+
   rescue Errno::EPIPE
     # client timeouted
     # do nothing
-    
+
   ensure
     socket.close
   end
@@ -43,7 +51,7 @@ class Eye::Server
   end
 
   finalizer :close_socket
-  
+
   def close_socket
     @server.close if @server
     unlink_socket_file

data/lib/eye/settings.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 module Eye::Settings
   module_function
-  
+
   def dir
     if root?
       '/var/run/eye'
@@ -26,7 +26,7 @@ module Eye::Settings
   def home
     ENV['EYE_HOME'] || ENV['HOME']
   end
-  
+
   def path(path)
     File.join(dir, path)
   end
@@ -38,11 +38,11 @@ module Eye::Settings
   def socket_path
     path(ENV['EYE_SOCK'] || "sock#{ENV['EYE_V']}")
   end
-  
+
   def pid_path
     path(ENV['EYE_PID'] || "pid#{ENV['EYE_V']}")
   end
-  
+
   def cache_path
     path("processes#{ENV['EYE_V']}.cache")
   end

data/lib/eye/system.rb

@@ -29,7 +29,7 @@ module Eye::System
 
     # Send signal to process (uses for kill)
     # code: TERM(15), KILL(9), QUIT(3), ...
-    def send_signal(pid, code = :TERM)      
+    def send_signal(pid, code = :TERM)
       code = 0 if code == '0'
       if code.to_s.to_i != 0
         code = code.to_i
@@ -38,7 +38,7 @@ module Eye::System
       code = code.to_s.upcase if code.is_a?(String) || code.is_a?(Symbol)
 
       if pid
-        ::Process.kill(code, pid) 
+        ::Process.kill(code, pid)
         {:result => :ok}
       else
         {:error => Exception.new('no_pid')}
@@ -59,7 +59,7 @@ module Eye::System
       pid  = Process::spawn(prepare_env(cfg), *Shellwords.shellwords(cmd), opts)
       Process.detach(pid)
       {:pid => pid}
-      
+
     rescue Errno::ENOENT, Errno::EACCES => ex
       {:error => ex}
     end
@@ -82,7 +82,7 @@ module Eye::System
 
     rescue Timeout::Error => ex
       if pid
-        Eye.warn "[#{cfg[:name]}] send signal 9 to #{pid} (because of timeouted<#{timeout}> execution)"
+        warn "[#{cfg[:name]}] send signal 9 to #{pid} (because of timeouted<#{timeout}> execution)"
         send_signal(pid, 9)
       end
       {:error => ex}
@@ -90,7 +90,7 @@ module Eye::System
     rescue Errno::ENOENT, Errno::EACCES => ex
       {:error => ex}
 
-    ensure 
+    ensure
       Process.detach(pid) if pid
     end
 
@@ -102,7 +102,7 @@ module Eye::System
       h = {}
       str.each_line do |line|
         chunk = line.strip.split(/\s+/)
-        h[chunk[0].to_i] = { :ppid => chunk[1].to_i, :cpu => chunk[2].to_i, 
+        h[chunk[0].to_i] = { :ppid => chunk[1].to_i, :cpu => chunk[2].to_i,
           :rss => chunk[3].to_i, :start_time => chunk[4] }
       end
       h
@@ -114,7 +114,10 @@ module Eye::System
     end
 
     def host
-      @host ||= `hostname`.chomp
+      @host ||= begin
+        require 'socket'
+        Socket.gethostname
+      end
     end
 
     # set host for tests