eye 0.5.2 → 0.6

data/lib/eye/process/states_history.rb

@@ -20,7 +20,7 @@ class Eye::Process::StatesHistory < Eye::Utils::Tail
   end
 
   def last_reason
-    last[:reason]
+    last[:reason] rescue nil
   end
 
   def last_state_changed_at

data/lib/eye/process/system.rb

@@ -37,8 +37,12 @@ module Eye::Process::System
   end
 
   def process_really_running?
-    res = Eye::System.check_pid_alive(self.pid)
-    debug "process_really_running?: (#{self.pid}) #{res.inspect}"
+    process_pid_running?(self.pid)
+  end
+
+  def process_pid_running?(pid)
+    res = Eye::System.check_pid_alive(pid)
+    debug "process_really_running?: (#{pid}) #{res.inspect}"
     !!res[:result]
   end
 

data/lib/eye/process/trigger.rb

@@ -13,7 +13,6 @@ module Eye::Process::Trigger
   end
 
   def check_triggers(transition)
-    return if unmonitored?
     self.triggers.each { |trigger| trigger.notify(transition, state_reason) }
   end
 

data/lib/eye/process/validate.rb

@@ -5,12 +5,12 @@ module Eye::Process::Validate
 
   class Error < Exception; end
 
-  def validate(config)
+  def validate(config, localize = true)
     if (str = config[:start_command])
       # it should parse with Shellwords and not raise
       spl = Shellwords.shellwords(str) * '#'
 
-      if config[:daemonize]
+      if config[:daemonize] && !config[:use_leaf_child]
         if spl =~ %r[sh#\-c|#&&#|;#]
           raise Error, "#{config[:name]}, daemonize does not support concats like '&&' in start_command"
         end
@@ -20,11 +20,13 @@ module Eye::Process::Validate
     Shellwords.shellwords(config[:stop_command]) if config[:stop_command]
     Shellwords.shellwords(config[:restart_command]) if config[:restart_command]
 
-    Etc.getpwnam(config[:uid]) if config[:uid]
-    Etc.getpwnam(config[:gid]) if config[:gid]
+    if localize
+      Etc.getpwnam(config[:uid]) if config[:uid]
+      Etc.getpwnam(config[:gid]) if config[:gid]
 
-    if config[:working_dir]
-      raise Error, "working_dir '#{config[:working_dir]}' is invalid" unless File.directory?(config[:working_dir])
+      if config[:working_dir]
+        raise Error, "working_dir '#{config[:working_dir]}' is invalid" unless File.directory?(config[:working_dir])
+      end
     end
   end
 

data/lib/eye/process/watchers.rb

@@ -59,13 +59,7 @@ private
   def watcher_tick(subject)
     unless subject.check
       return unless up?
-
-      actions = subject.fires ? Array(subject.fires) : [:restart]
-      notify :warn, "Bounded #{subject.check_name}: #{subject.last_human_values} send to #{actions}"
-
-      actions.each do |action|
-        schedule action, Eye::Reason.new("bounded #{subject.check_name}")
-      end
+      subject.fire
     end
   end
 

data/lib/eye/system.rb

@@ -1,6 +1,7 @@
 require 'shellwords'
 require 'pathname'
 require 'etc'
+require 'timeout'
 
 module Eye::System
   class << self
@@ -103,22 +104,24 @@ module Eye::System
       Pathname.new(file).expand_path(working_dir).to_s
     end
 
-  private
-
     def spawn_options(config = {})
-      o = {pgroup: true, chdir: config[:working_dir] || '/'}
-      o.update(out: [config[:stdout], 'a']) if config[:stdout]
-      o.update(err: [config[:stderr], 'a']) if config[:stderr]
-      o.update(in: config[:stdin]) if config[:stdin]
+      options = {
+        pgroup: true,
+        chdir: config[:working_dir] || '/'
+      }
+
+      options[:out]   = [config[:stdout], 'a'] if config[:stdout]
+      options[:err]   = [config[:stderr], 'a'] if config[:stderr]
+      options[:in]    = config[:stdin] if config[:stdin]
+      options[:umask] = config[:umask] if config[:umask]
+      options[:close_others] = false if config[:preserve_fds]
 
       if Eye::Local.root?
-        o.update(uid: Etc.getpwnam(config[:uid]).uid) if config[:uid]
-        o.update(gid: Etc.getpwnam(config[:gid]).gid) if config[:gid]
+        options[:uid] = Etc.getpwnam(config[:uid]).uid if config[:uid]
+        options[:gid] = Etc.getpwnam(config[:gid]).gid if config[:gid]
       end
 
-      o.update(umask: config[:umask]) if config[:umask]
-
-      o
+      options
     end
 
     def prepare_env(config = {})

data/lib/eye/system_resources.rb

@@ -32,6 +32,14 @@ class Eye::SystemResources
       end
     end
 
+    # last child in a children tree
+    def leaf_child(pid)
+      c = children(pid)
+      return if c.empty?
+      c += children(c.shift) while c.size > 1
+      c[0]
+    end
+
     def resources(pid)
       { :memory => memory(pid),
         :cpu => cpu(pid),

data/lib/eye/trigger.rb

@@ -4,8 +4,12 @@ class Eye::Trigger
   autoload :Flapping,   'eye/trigger/flapping'
   autoload :Transition, 'eye/trigger/transition'
   autoload :StopChildren, 'eye/trigger/stop_children'
+  autoload :WaitDependency, 'eye/trigger/wait_dependency'
+  autoload :CheckDependency, 'eye/trigger/check_dependency'
 
-  TYPES = {:flapping => 'Flapping', :transition => 'Transition', :stop_children => 'StopChildren'}
+  TYPES = {:flapping => 'Flapping', :transition => 'Transition', :stop_children => 'StopChildren',
+    :wait_dependency => 'WaitDependency', :check_dependency => 'CheckDependency'
+  }
 
   attr_reader :message, :options, :process
 
@@ -22,7 +26,7 @@ class Eye::Trigger
   def self.get_class(type)
     klass = eval("Eye::Trigger::#{TYPES[type]}") rescue nil
     raise "unknown trigger #{type}" unless klass
-    if deps = klass.depends_on
+    if deps = klass.requires
       Array(deps).each { |d| require d }
     end
     klass
@@ -68,7 +72,11 @@ class Eye::Trigger
     check(transition) if filter_transition(transition)
 
   rescue Exception, Timeout::Error => ex
-    log_ex(ex)
+    if ex.class == Eye::Process::StateError
+      raise ex
+    else
+      log_ex(ex)
+    end
   end
 
   param :to, [Symbol, Array]
@@ -102,7 +110,7 @@ class Eye::Trigger
     Eye::Trigger.const_set(name, base)
   end
 
-  def self.depends_on
+  def self.requires
   end
 
   class Custom < Eye::Trigger

data/lib/eye/trigger/check_dependency.rb

@@ -0,0 +1,30 @@
+class Eye::Trigger::CheckDependency < Eye::Trigger
+  param :names, [Array], true, 5
+
+  def check(transition)
+    check_dependency(transition.to_name) if transition.from_name == :up
+  end
+
+private
+
+  def check_dependency(to)
+    processes = names.map do |name|
+      Eye::Control.find_nearest_process(name, process.group_name_pure, process.app_name)
+    end.compact
+    return if processes.empty?
+    processes = Eye::Utils::AliveArray.new(processes)
+
+    act = case to
+      when :down, :restarting; :restart
+      when :stopping; :stop
+      when :unmonitored; :unmonitor
+    end
+
+    if act
+      processes.each do |p|
+        p.schedule act, Eye::Reason.new(:"#{act} dependecies")
+      end
+    end
+  end
+
+end

data/lib/eye/trigger/stop_children.rb

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

data/lib/eye/trigger/wait_dependency.rb

@@ -0,0 +1,49 @@
+class Eye::Trigger::WaitDependency < Eye::Trigger
+  param :names, [Array], true
+  param :wait_timeout, [Numeric], nil, 15.seconds
+  param :retry_after, [Numeric], nil, 1.minute
+  param :should_start, [TrueClass, FalseClass]
+
+  def check(transition)
+    wait_dependency if transition.to_name == :starting
+  end
+
+private
+
+  def wait_dependency
+    processes = names.map do |name|
+      Eye::Control.find_nearest_process(name, process.group_name_pure, process.app_name)
+    end.compact
+    return if processes.empty?
+    processes = Eye::Utils::AliveArray.new(processes)
+
+    processes.each do |p|
+      if p.state_name != :up && (should_start == nil || should_start)
+        p.schedule :start, Eye::Reason.new(:start_dependency)
+      end
+    end
+
+    res = true
+
+    processes.pmap do |p|
+      name = p.name
+
+      res &= process.wait_for_condition(wait_timeout, 0.5) do
+        info "wait for #{name} until it :up"
+        p.state_name == :up
+      end
+    end
+
+    unless res
+      warn "not waited for #{names} to be up"
+      process.switch :unmonitoring
+
+      if retry_after
+        process.schedule_in retry_after, :start, Eye::Reason.new(:wait_dependency)
+      end
+
+      raise Eye::Process::StateError.new('stop transition because dependency is not up')
+    end
+  end
+
+end

data/lib/eye/utils.rb

@@ -13,6 +13,19 @@ module Eye::Utils
     end
   end
 
+  # deep merging b into a (a deeply changed)
+  def self.deep_merge!(a, b, allowed_keys = nil)
+    b.each do |k, v|
+      next if allowed_keys && !allowed_keys.include?(k)
+      if a[k].is_a?(Hash) && v.is_a?(Hash)
+        deep_merge!(a[k], v)
+      else
+        a[k] = v
+      end
+    end
+    a
+  end
+
   D1 = '%H:%M'
   D2 = '%b%d'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: '0.6'
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -42,28 +42,28 @@ dependencies:
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,162 +112,149 @@ dependencies:
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forking
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: parallel_tests
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)
   >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.
 email: eye-rb@googlegroups.com
 executables:
 - eye
 - loader_eye
+- runner
 extensions: []
 extra_rdoc_files: []
 files:
@@ -281,7 +268,12 @@ files:
 - Rakefile
 - bin/eye
 - bin/loader_eye
+- bin/runner
+- examples/dependency.eye
 - examples/notify.eye
+- examples/plugin/README.md
+- examples/plugin/main.eye
+- examples/plugin/plugin.rb
 - examples/process_thin.rb
 - examples/processes/em.rb
 - examples/processes/forking.rb
@@ -297,6 +289,8 @@ files:
 - lib/eye.rb
 - lib/eye/application.rb
 - lib/eye/checker.rb
+- lib/eye/checker/children_count.rb
+- lib/eye/checker/children_memory.rb
 - lib/eye/checker/cpu.rb
 - lib/eye/checker/cputime.rb
 - lib/eye/checker/file_ctime.rb
@@ -363,9 +357,11 @@ files:
 - lib/eye/system.rb
 - lib/eye/system_resources.rb
 - lib/eye/trigger.rb
+- lib/eye/trigger/check_dependency.rb
 - lib/eye/trigger/flapping.rb
 - lib/eye/trigger/stop_children.rb
 - lib/eye/trigger/transition.rb
+- lib/eye/trigger/wait_dependency.rb
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb
 - lib/eye/utils/celluloid_chain.rb
@@ -384,17 +380,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)