eye 0.3.2 → 0.4

data/lib/eye/notify/jabber.rb

@@ -1,10 +1,10 @@
 class Eye::Notify::Jabber < Eye::Notify
-  
+
   # Eye.config do
   #   jabber :host => "some.host", :port => 12345, :user => "eye@some.host", :password => "123456"
   #   contact :vasya, :jabber, "vasya@some.host"
   # end
-  
+
   param :host, String, true
   param :port, [String, Fixnum], true
   param :user, String, true

data/lib/eye/notify/mail.rb

@@ -14,10 +14,10 @@ class Eye::Notify::Mail < Eye::Notify
   param :user, String
   param :password, String
   param :auth, Symbol, nil, nil, [:plain, :login, :cram_md5]
-  
+
   param :from_mail, String
   param :from_name, String, nil, 'eye'
-  
+
   def execute
     smtp
   end

data/lib/eye/process.rb

@@ -2,7 +2,7 @@ require 'celluloid'
 
 class Eye::Process
   include Celluloid
-  
+
   autoload :Config,           'eye/process/config'
   autoload :Commands,         'eye/process/commands'
   autoload :Data,             'eye/process/data'
@@ -17,19 +17,19 @@ class Eye::Process
   autoload :Scheduler,        'eye/process/scheduler'
   autoload :Validate,         'eye/process/validate'
 
-  attr_accessor :pid, :watchers, :config, :states_history, 
-                :childs, :triggers, :name, :state_reason
-  
+  attr_accessor :pid, :watchers, :config, :states_history,
+                :childs, :triggers, :name, :state_reason, :flapping_times
+
   def initialize(config)
     raise 'pid file should be' unless config[:pid_file]
 
     @config = prepare_config(config)
-    @logger = Eye::Logger.new(full_name)
 
     @watchers = {}
     @childs = {}
     @triggers = []
     @name = @config[:name]
+    @flapping_times = 0
 
     @states_history = Eye::Process::StatesHistory.new(100)
     @states_history << :unmonitored
@@ -41,22 +41,22 @@ class Eye::Process
     super() # for statemachine
   end
 
-  # c(), self[]  
+  # c(), self[]
   include Eye::Process::Config
-  
+
   # full_name, status_data
   include Eye::Process::Data
-  
+
   # commands:
   # start_process, stop_process, restart_process
   include Eye::Process::Commands
 
   # start, stop, restart, monitor, unmonit, delete
   include Eye::Process::Controller
-  
+
   # add_watchers, remove_watchers:
   include Eye::Process::Watchers
-  
+
   # check alive, crash methods:
   include Eye::Process::Monitor
 
@@ -72,9 +72,6 @@ class Eye::Process
   # manage notify methods
   include Eye::Process::Notify
 
-  # logger methods
-  include Eye::Logger::Helpers
-
   # scheduler
   include Eye::Process::Scheduler
 

data/lib/eye/process/child.rb

@@ -31,7 +31,7 @@ module Eye::Process::Child
     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
     end
 
     if removed_childs.present?

data/lib/eye/process/commands.rb

@@ -7,7 +7,7 @@ module Eye::Process::Commands
 
     unless self[:start_command]
       warn 'no start command, so unmonitoring'
-      switch :unmonitoring
+      switch :unmonitoring, Eye::Reason.new(:no_start_command)
       return :no_start_command
     end
 
@@ -35,7 +35,7 @@ module Eye::Process::Commands
 
     :state_error
   end
-  
+
   def stop_process
     debug 'stop_process command'
 
@@ -46,19 +46,15 @@ module Eye::Process::Commands
     if process_realy_running?
       warn 'NOT STOPPED, check command/signals, or tune stop_timeout/stop_grace, seems it was really soft'
 
-      switch :unmonitoring
+      switch :unmonitoring, Eye::Reason.new(:'not stopped (soft command)')
       nil
 
     else
       switch :stopped
 
-      if control_pid?
-        info "delete pid_file: #{self[:pid_file_ex]}"
-        clear_pid_file 
-      end
-      
-      true
+      clear_pid_file if self[:clear_pid] # by default for all
 
+      true
     end
 
   rescue StateMachine::InvalidTransition => e
@@ -73,7 +69,7 @@ module Eye::Process::Commands
 
     if self[:restart_command]
       execute_restart_command
-      sleep self[:restart_timeout].to_f
+      sleep_grace(:restart_grace)
       result = check_alive_with_refresh_pid_if_needed
       switch(result ? :restarted : :crashed)
     else
@@ -106,7 +102,7 @@ private
         end
       end
 
-      sleep self[:stop_grace].to_f
+      sleep_grace(:stop_grace)
 
     elsif self[:stop_signals]
       info "executing stop_signals #{self[:stop_signals].inspect}"
@@ -119,7 +115,7 @@ private
         delay = stop_signals.shift
         signal = stop_signals.shift
 
-        if wait_for_condition(delay.to_f, 0.1){ !process_realy_running? }
+        if wait_for_condition(delay.to_f, 0.3){ !process_realy_running? }
           info 'has terminated'
           break
         end
@@ -127,17 +123,17 @@ private
         send_signal(signal)
       end
 
-      sleep self[:stop_grace].to_f
+      sleep_grace(:stop_grace)
 
     else # default command
-      info "executing: `kill -TERM #{self.pid}` with stop_grace: #{self[:stop_grace].to_f}s"
+      debug "executing: `kill -TERM #{self.pid}` with stop_grace: #{self[:stop_grace].to_f}s"
       send_signal(:TERM)
-      
-      sleep self[:stop_grace].to_f
+
+      sleep_grace(:stop_grace)
 
       # if process not die here, by default we force kill it
       if process_realy_running?
-        warn "process not die after TERM and stop_grace #{self[:stop_grace].to_f}s, so send KILL"
+        warn "process not die after TERM and stop_grace #{self[:stop_grace].to_f}s, so send KILL(#{self.pid})"
         send_signal(:KILL)
         sleep 0.1 # little grace
       end
@@ -160,7 +156,7 @@ private
 
     res
   end
-  
+
   def daemonize_process
     time_before = Time.now
     res = Eye::System.daemonize(self[:start_command], config)
@@ -169,15 +165,15 @@ private
     info "daemonizing: `#{self[:start_command]}` with start_grace: #{self[:start_grace].to_f}s, env: #{self[:environment].inspect}, working_dir: #{self[:working_dir]} (pid:#{res[:pid]})"
 
     if res[:error]
-      error "raised with #{res[:error].inspect}"
-
       if res[:error].message == 'Permission denied - open'
-        error 'seems stdout/err/all files is not writable'
+        error "raised with #{res[:error].inspect}, seems #{[self[:stdout], self[:stderr]]} files are not writable"
+      else
+        error "raised with #{res[:error].inspect}"
       end
 
       return {:error => res[:error].inspect}
     end
-    
+
     self.pid = res[:pid]
 
     unless self.pid
@@ -185,7 +181,7 @@ private
       return {:error => :empty_pid}
     end
 
-    sleep self[:start_grace].to_f
+    sleep_grace(:start_grace)
 
     unless process_realy_running?
       error "process with pid(#{self.pid}) not found, may be crashed (#{check_logs_str})"
@@ -193,9 +189,9 @@ private
     end
 
     unless failsafe_save_pid
-      return {:error => :cant_write_pid} 
+      return {:error => :cant_write_pid}
     end
-    
+
     res
   end
 
@@ -204,13 +200,13 @@ private
     time_before = Time.now
 
     res = execute(self[:start_command], config.merge(:timeout => config[:start_timeout]))
-    start_time = Time.now - time_before    
+    start_time = Time.now - time_before
 
     if res[:error]
-      error "raised with #{res[:error].inspect}"
-
       if res[:error].message == 'Permission denied - open'
-        error 'seems stdout/err/all files is not writable'
+        error "raised with #{res[:error].inspect}, seems #{[self[:stdout], self[:stderr]]} files are not writable"
+      else
+        error "raised with #{res[:error].inspect}"
       end
 
       if res[:error].class == Timeout::Error
@@ -220,7 +216,7 @@ private
       return {:error => res[:error].inspect}
     end
 
-    sleep self[:start_grace].to_f
+    sleep_grace(:start_grace)
 
     unless set_pid_from_file
       error "pid_file(#{self[:pid_file_ex]}) does not appears after start_grace #{self[:start_grace].to_f}, check start_command, or tune start_grace (eye dont know what to monitor without pid)"
@@ -241,8 +237,8 @@ private
     if !self[:stdout] && !self[:stderr]
       'maybe should add stdout/err/all logs'
     else
-      "check also it stdout/err/all logs #{[self[:stdout], self[:stderr]].inspect}"
-    end    
+      "check also it stdout/err/all logs #{[self[:stdout], self[:stderr]]}"
+    end
   end
 
   def prepare_command(command)
@@ -253,4 +249,10 @@ private
     end
   end
 
+  def sleep_grace(grace_name)
+    grace = self[grace_name].to_f
+    info "sleeping for :#{grace_name} #{grace}"
+    sleep grace
+  end
+
 end

data/lib/eye/process/config.rb

@@ -8,14 +8,15 @@ module Eye::Process::Config
     :stop_timeout => 10.seconds,
     :restart_timeout => 10.seconds,
 
-    :start_grace => 2.5.seconds, 
-    :stop_grace => 0.5.seconds, 
-    :restart_grace => 0.5.seconds, 
+    :start_grace => 2.5.seconds,
+    :stop_grace => 0.5.seconds,
+    :restart_grace => 1.second,
 
     :daemonize => false,
     :auto_start => true, # auto start on monitor action
 
-    :childs_update_period => 30.seconds
+    :childs_update_period => 30.seconds,
+    :clear_pid => true # by default clear pid on stop
   }
 
   def prepare_config(new_config)
@@ -30,25 +31,26 @@ module Eye::Process::Config
       h[:triggers] ||= {}
       h[:triggers][:flapping] = {:type => :flapping, :times => 10, :within => 10.seconds}
     end
-    
+
     h[:stdout] = Eye::System.normalized_file(h[:stdout], h[:working_dir]) if h[:stdout]
     h[:stderr] = Eye::System.normalized_file(h[:stderr], h[:working_dir]) if h[:stderr]
 
-    h    
+    h
   end
 
   def c(name)
     @config[name]
   end
-  
+
   def [](name)
     @config[name]
   end
-  
+
   def update_config(new_config = {})
     new_config = prepare_config(new_config)
     @config = new_config
     @full_name = nil
+    @logger = nil
 
     debug "update config to: #{@config.inspect}"
 
@@ -57,14 +59,17 @@ module Eye::Process::Config
 
     if up?
       # rebuild checks for this process
-      from_up; on_up
-    end    
+      remove_watchers
+      remove_childs
+
+      add_watchers
+      add_childs
+    end
   end
 
   # is pid_file under Eye::Process control, or not
   def control_pid?
-    return self[:control_pid] unless self[:control_pid].nil?
     !!self[:daemonize]
   end
-  
+
 end

data/lib/eye/process/controller.rb

@@ -52,7 +52,7 @@ module Eye::Process::Controller
   def unmonitor
     switch :unmonitoring
   end
-  
+
   def delete
     if self[:stop_on_delete]
       info 'process has stop_on_delete option, so sync-stop it first'
@@ -67,10 +67,7 @@ module Eye::Process::Controller
   end
 
   def signal(sig = 0)
-    if self.pid
-      res = send_signal(sig) 
-      info "send signal #{sig} to #{self.pid} = #{res}"
-    end
+    send_signal(sig) if self.pid
   end
-  
+
 end

data/lib/eye/process/data.rb

@@ -1,8 +1,19 @@
 module Eye::Process::Data
 
-  # logger tag
+  def logger_tag
+    full_name
+  end
+
+  def app_name
+    self[:application]
+  end
+
+  def group_name
+    (self[:group] == '__default__') ? nil : self[:group]
+  end
+
   def full_name
-    @full_name ||= [self[:application], (self[:group] == '__default__') ? nil : self[:group], self[:name]].compact.join(':')
+    @full_name ||= [app_name, group_name, self[:name]].compact.join(':')
   end
 
   def status_data(debug = false)
@@ -19,8 +30,8 @@ module Eye::Process::Data
   end
 
   def self_status_data(debug = false)
-    h = { name: name, state: state, 
-          type: (self.class == Eye::ChildProcess ? :child_process : :process), 
+    h = { name: name, state: state,
+          type: (self.class == Eye::ChildProcess ? :child_process : :process),
           resources: Eye::SystemResources.resources(pid) }
 
     if @states_history
@@ -31,7 +42,7 @@ module Eye::Process::Data
     h.merge!(debug: debug_data) if debug
     h.merge!(current_command: current_scheduled_command) if current_scheduled_command
 
-    h    
+    h
   end
 
   def debug_data

data/lib/eye/process/monitor.rb

@@ -15,7 +15,7 @@ private
   def try_update_pid_from_file
     # if pid file was rewrited
     newpid = load_pid_from_file
-    if newpid != self.pid 
+    if newpid != self.pid
       info "process changed pid to #{newpid}, updating..." if self.pid
       self.pid = newpid
 
@@ -23,7 +23,7 @@ private
         return true
       else
         warn "process with new_pid #{newpid} not found"
-        return false          
+        return false
       end
     else
       debug 'process not found'
@@ -32,7 +32,7 @@ private
   end
 
   REWRITE_FACKUP_PIDFILE_PERIOD = 2.minutes
-  
+
   def check_alive
     if up?
 
@@ -40,11 +40,13 @@ private
       unless process_realy_running?
         warn "check_alive: process(#{self.pid}) not found!"
         notify :info, 'crashed!'
+        clear_pid_file if control_pid? && self.pid && load_pid_from_file == self.pid
+
         switch :crashed, Eye::Reason.new(:crashed)
       else
         # check that pid_file still here
         ppid = failsafe_load_pid
-        
+
         if ppid != self.pid
           msg = "check_alive: pid_file(#{self[:pid_file]}) changes by itself (pid:#{self.pid}) => (pid:#{ppid})"
           if control_pid?
@@ -78,7 +80,12 @@ private
     if down?
       if self[:keep_alive]
         warn 'check crashed: process is down'
-        schedule :restore, Eye::Reason.new(:crashed)
+
+        if self[:restore_in]
+          schedule_in self[:restore_in].to_f, :restore, Eye::Reason.new(:crashed)
+        else
+          schedule :restore, Eye::Reason.new(:crashed)
+        end
       else
         warn 'check crashed: process without keep_alive'
         schedule :unmonitor, Eye::Reason.new(:crashed)