eye 0.8.rc → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82745fa85f30eae42687f61dde6724bd5ed1bcd
-  data.tar.gz: cf600cf41608a73e8512cc0dedc885c63509a2c8
+  metadata.gz: 881c3139243423bac750f9b13715f7a17a05703b
+  data.tar.gz: 1cfb74cc03c6a05a70df392a5a7871868167e9ec
 SHA512:
-  metadata.gz: b6e01c90b2c7b1d3eef6cc6b7eda39aa29a6601b994b9c33897a81e2cb41a11356e00389ec1252aeb1f2295d3f950250a6216ab50abe768cd9a469cf7f24eb6e
-  data.tar.gz: 0e07121c4ef3fe34eac78a2b82b736ff298dcb7912df26506838ccc14aa0c5f020a9aa9a275adecbd6109181a6941704d4ac0ef007c960a9682512b6ad3ea7a2
+  metadata.gz: e4e6b73614e4dc6dd54afb12324f15eb31850f9bb0acce786b4f677f63e313a806155afa523b9e10760743a24a2066f7ab948d8872cd039bffb62f74113bf227
+  data.tar.gz: 75b41b0387f461bf333064e98b869c25279dd73c5911778f95ffc00374fcf5639a6a5d90af0a2fd1a3ceca7e602673570e8cf77e475e760e26dc2b053b432235

data/CHANGES.md

@@ -1,6 +1,10 @@
-0.8.pre
+0.8
 -------
-* Update Celluloid to 0.17.0
+* info, xinfo, oinfo, history now support -j flag, to output json
+* leye: many fixes (--eyehome, --eyefile)
+* add flapping reretry_in (#152)
+* add check_identity of processes, avoid many bugs with wrong pid_files, or auto changed pids (#62)
+* update Celluloid to 0.17
 
 0.7
 -------
@@ -17,7 +21,7 @@
 * some fixes in flapping
 * add proxy_url to http check
 * process with children, shows children history now
-* Update Celluloid to 0.16.0
+* update Celluloid to 0.16
 
 0.6.4
 -----

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = '0.8.rc'
+  VERSION   = '0.8'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/checker.rb

@@ -97,11 +97,13 @@ class Eye::Checker
   end
 
   def check
-    if initial_grace && (Time.now - @initialized_at < initial_grace)
-      debug { 'skipped initial grace' }
-      return true
-    else
-      @options[:initial_grace] = nil
+    if initial_grace
+      if Time.now - @initialized_at < initial_grace
+        debug { 'skipped initial grace' }
+        return true
+      else
+        @options[:initial_grace] = nil
+      end
     end
 
     @value = get_value_safe
@@ -124,7 +126,7 @@ class Eye::Checker
       end
     end
 
-    info "#{last_human_values} => #{result ? 'OK' : 'Fail'}"
+    info { "#{last_human_values} => #{result ? 'OK' : 'Fail'}" }
     result
 
   rescue Object => ex

data/lib/eye/config.rb

@@ -32,39 +32,40 @@ class Eye::Config
 
   # raise an error if config wrong
   def validate!(validate_apps = [])
-    all_processes = processes
-
     # Check blank pid_files
-    no_pid_file = all_processes.select { |c| c[:pid_file].blank? }
-    if no_pid_file.present?
+    no_pid_file = []
+    each_process { |c| no_pid_file << c if c[:pid_file].blank? }
+    if no_pid_file.any?
       raise Eye::Dsl::Error, "blank pid_file for: #{no_pid_file.map { |c| c[:name] } * ', '}"
     end
 
     # Check duplicates of the full pid_file
 
-    dupl_pids = all_processes.each_with_object(Hash.new(0)) do |o, h|
+    dupl_pids = Hash.new(0)
+    each_process do |o|
       ex_pid_file = Eye::System.normalized_file(o[:pid_file], o[:working_dir])
-      h[ex_pid_file] += 1
+      dupl_pids[ex_pid_file] += 1
     end
     dupl_pids = dupl_pids.select { |_, v| v > 1 }
 
-    if dupl_pids.present?
+    if dupl_pids.any?
       raise Eye::Dsl::Error, "duplicate pid_files: #{dupl_pids.inspect}"
     end
 
     # Check duplicates of the full_name
-    dupl_names = all_processes.each_with_object(Hash.new(0)) do |o, h|
+    dupl_names = Hash.new(0)
+    each_process do |o|
       full_name = "#{o[:application]}:#{o[:group]}:#{o[:name]}"
-      h[full_name] += 1
+      dupl_names[full_name] += 1
     end
     dupl_names = dupl_names.select { |_, v| v > 1 }
 
-    if dupl_names.present?
+    if dupl_names.any?
       raise Eye::Dsl::Error, "duplicate names: #{dupl_names.inspect}"
     end
 
     # validate processes with their own validate
-    all_processes.each do |process_cfg|
+    each_process do |process_cfg|
       Eye::Process.validate process_cfg, validate_apps.include?(process_cfg[:application])
     end
 
@@ -73,10 +74,8 @@ class Eye::Config
   end
 
   def transform!
-    all_processes = processes
-
     # transform syslog option
-    all_processes.each do |process|
+    each_process do |process|
       out = process[:stdout] && process[:stdout].start_with?(':syslog')
       err = process[:stderr] && process[:stderr].start_with?(':syslog')
       next unless err || out
@@ -95,8 +94,12 @@ class Eye::Config
     end
   end
 
-  def processes
-    applications.values.map { |e| (e[:groups] || {}).values.map { |c| (c[:processes] || {}).values } }.flatten
+  def each_process(&block)
+    applications.each_value do |app_cfg|
+      (app_cfg[:groups] || {}).each_value do |gr_cfg|
+        (gr_cfg[:processes] || {}).each_value(&block)
+      end
+    end
   end
 
   def application_names

data/lib/eye/controller.rb

@@ -1,4 +1,4 @@
-require 'celluloid'
+require 'celluloid/current'
 require 'yaml'
 
 require_relative 'utils/pmap'

data/lib/eye/controller/load.rb

@@ -78,11 +78,7 @@ private
   # return: result, config
   def parse_config(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
+    Eye::Dsl.parse(nil, filename)
   end
 
   # !!! exclusive operation

data/lib/eye/dsl.rb

@@ -37,7 +37,9 @@ class Eye::Dsl
 
       Eye.parsed_config.transform!
       Eye.parsed_config.validate!
-      Eye.parsed_config
+      parsed_config = Eye.parsed_config
+      Eye.parsed_config = nil # remove object for better GC
+      parsed_config
     end
 
     def parse_apps(*args)

data/lib/eye/process/system.rb

@@ -61,9 +61,7 @@ module Eye::Process::System
   end
 
   def process_pid_running?(pid)
-    res = Eye::System.check_pid_alive(pid)
-    debug { "process_really_running?: <#{pid}> #{res.inspect}" }
-    !!res[:result]
+    Eye::System.pid_alive?(pid)
   end
 
   def send_signal(code)

data/lib/eye/system.rb

@@ -25,8 +25,12 @@ module Eye::System
     # very fast
     # return true/false
     def pid_alive?(pid)
-      res = check_pid_alive(pid)
-      !!res[:result]
+      if pid
+        ::Process.kill(0, pid)
+        true
+      end
+    rescue
+      false
     end
 
     # Send signal to process (uses for kill)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.8.rc
+  version: '0.8'
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)