eye 0.3.2 → 0.4

data/lib/eye/system_resources.rb

@@ -31,8 +31,8 @@ class Eye::SystemResources
     def resources(pid)
       return {} unless ps_aux[pid]
 
-      { :memory => memory(pid), 
-        :cpu => cpu(pid), 
+      { :memory => memory(pid),
+        :cpu => cpu(pid),
         :start_time => start_time(pid),
         :pid => pid
       }
@@ -42,14 +42,14 @@ class Eye::SystemResources
     def setup
       @actor ||= PsAxActor.new
     end
-    
+
   private
 
     def reset!
       setup.terminate
       @actor = nil
     end
-  
+
     def ps_aux
       setup
       @actor.get

data/lib/eye/trigger.rb

@@ -1,13 +1,24 @@
 class Eye::Trigger
-  include Eye::Logger::Helpers
-  
   autoload :Flapping,   'eye/trigger/flapping'
+  autoload :State,      'eye/trigger/state'
 
   # ex: { :type => :flapping, :times => 2, :within => 30.seconds}
 
-  TYPES = {:flapping => "Flapping"}
+  TYPES = {:flapping => "Flapping", :state => "State"}
 
-  attr_reader :message, :options
+  attr_reader :message, :options, :process
+
+  extend Eye::Dsl::Validation
+
+  def self.name_and_class(type)
+    type = type.to_sym
+    return {:name => type, :type => type} if TYPES[type]
+
+    if type =~ /\A(.*?)_?[0-9]+\z/
+      ctype = $1.to_sym
+      return {:name => type, :type => ctype} if TYPES[ctype]
+    end
+  end
 
   def self.get_class(type)
     klass = eval("Eye::Trigger::#{TYPES[type]}") rescue nil
@@ -15,39 +26,65 @@ class Eye::Trigger
     klass
   end
 
-  def self.create(options = {}, logger_prefix = nil)
-    get_class(options[:type]).new(options, logger_prefix)
+  def self.create(process, options = {})
+    get_class(options[:type]).new(process, options)
   end
 
   def self.validate!(options = {})
     get_class(options[:type]).validate(options)
   end
 
-  def initialize(options = {}, logger_prefix = nil)
+  def initialize(process, options = {})
     @options = options
-    @logger = Eye::Logger.new(logger_prefix, "trigger")
+    @process = process
 
     debug "add #{options}"
   end
 
-  def check(states_history)
-    @states_history = states_history
+  def inspect
+    "<#{self.class} @process='#{@process.full_name}' @options=#{@options}>"
+  end
 
-    res = good?
+  def logger_tag
+    @process.logger.prefix
+  end
 
-    if res
-      debug 'check flapping'
-    else
-      debug "!!! #{self.class} recognized !!!"
-    end
-    
-    res
+  def logger_sub_tag
+    "trigger(#{@options[:type]})"
   end
 
-  def good?
-    raise 'realize me'
+  def notify(transition)
+    debug "check"
+    @transition = transition
+    check(transition)
+  rescue => ex
+    warn "failed #{ex.message} #{ex.backtrace}"
   end
 
-  extend Eye::Dsl::Validation
+  def check(transition)
+    raise "realize me"
+  end
+
+  def run_in_process_context(p)
+    process.instance_exec(&p) if process.alive?
+  end
+
+  def defer(&block)
+    Celluloid::Future.new(&block).value
+  end
 
+  def self.register(base)
+    name = base.to_s.gsub("Eye::Trigger::", '')
+    name = base.to_s
+    type = name.underscore.to_sym
+    Eye::Trigger::TYPES[type] = name
+    Eye::Trigger.const_set(name, base)
+  end
+
+  class Custom < Eye::Trigger
+    def self.inherited(base)
+      super
+      register(base)
+    end
+  end
 end

data/lib/eye/trigger/flapping.rb

@@ -1,6 +1,6 @@
 class Eye::Trigger::Flapping < Eye::Trigger
 
-  # triggers :flapping, :times => 10, :within => 1.minute, 
+  # triggers :flapping, :times => 10, :within => 1.minute,
   #          :retry_in => 10.minutes, :retry_times => 15
 
   param :times, [Fixnum], true, 5
@@ -13,16 +13,36 @@ class Eye::Trigger::Flapping < Eye::Trigger
     @last_at = nil
   end
 
+  def check(transition)
+    unless good?
+      on_flapping
+    end
+  end
+
+private
+
   def good?
-    states = @states_history.states_for_period( within, @last_at )
+    states = process.states_history.states_for_period( within, @last_at )
     down_count = states.count{|st| st == :down }
 
     if down_count >= times
-      @last_at = @states_history.last_state_changed_at
+      @last_at = process.states_history.last_state_changed_at
       false
     else
       true
     end
   end
 
-end
+  def on_flapping
+    debug "flapping recognized!!!"
+
+    process.notify :error, 'flapping!'
+    process.schedule :unmonitor, Eye::Reason.new(:flapping)
+
+    return unless retry_in
+    return if retry_times && process.flapping_times >= retry_times
+
+    process.schedule_in(retry_in.to_f, :retry_start_after_flapping)
+  end
+
+end

data/lib/eye/trigger/state.rb

@@ -0,0 +1,28 @@
+class Eye::Trigger::State < Eye::Trigger
+
+  # triggers :state, :to => :up, :from => :starting, :do => ->{ ... }
+
+  param :to, [Symbol, Array]
+  param :from, [Symbol, Array]
+  param :event, [Symbol, Array]
+  param :do, [Proc]
+
+  def check(trans)
+    if compare(trans.to_name, to) || compare(trans.from_name, from) || compare(trans.event, event)
+      debug "trans ok #{trans}, executing proc!"
+      run_in_process_context(@options[:do]) if @options[:do]
+    end
+  end
+
+private
+
+  def compare(state_name, condition)
+    case condition
+    when Symbol
+      state_name == condition
+    when Array
+      condition.include?(state_name)
+    end
+  end
+
+end

data/lib/eye/utils/alive_array.rb

@@ -2,7 +2,7 @@ class Eye::Utils::AliveArray
   extend Forwardable
   include Enumerable
 
-  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, 
+  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push,
                         :flatten, :present?, :uniq!
 
   def initialize(arr = [])

data/lib/eye/utils/celluloid_klass.rb

@@ -0,0 +1,5 @@
+class Celluloid::SyncProxy
+  def __klass__
+    @klass
+  end
+end

data/lib/eye/utils/pmap.rb

@@ -0,0 +1,7 @@
+module Enumerable
+  # Simple parallel map using Celluloid::Futures
+  def pmap(&block)
+    futures = map { |elem| Celluloid::Future.new(elem, &block) }
+    futures.map { |future| future.value }
+  end
+end

data/lib/eye/utils/tail.rb

@@ -9,7 +9,7 @@ class Eye::Utils::Tail < Array
 
   def push(el)
     super(el)
-    shift if length > @max_size 
+    shift if length > @max_size
     self
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: '0.4'
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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. An alternative to God and Bluepill. With Bluepill
   like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 email: kostya27@gmail.com
@@ -328,10 +342,12 @@ files:
 - lib/eye/system_resources.rb
 - lib/eye/trigger.rb
 - lib/eye/trigger/flapping.rb
+- lib/eye/trigger/state.rb
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb
 - lib/eye/utils/celluloid_chain.rb
-- lib/eye/utils/leak_19.rb
+- lib/eye/utils/celluloid_klass.rb
+- lib/eye/utils/pmap.rb
 - lib/eye/utils/tail.rb
 homepage: http://github.com/kostya/eye
 licenses:

data/lib/eye/utils/leak_19.rb

@@ -1,7 +0,0 @@
-# http://stackoverflow.com/questions/7263268/ruby-symbolto-proc-leaks-references-in-1-9-2-p180
-
-class Symbol
-  def to_proc
-    lambda { |x| x.send(self) }
-  end
-end