reel-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,297 +1,290 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: reel-eye
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: '0.4'
 platform: ruby
-authors: 
+authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-07 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: celluloid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 13
-        - 0
-        version: 0.13.0
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: celluloid-io
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 13
-        - 0
-        version: 0.13.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: state_machine
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
-        version: 3.2.0
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: state_machine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: reel
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -853327506
-        segments: 
-        - 0
-        - 4
-        - 0
-        - pre
+      - !ruby/object:Gem::Version
         version: 0.4.0.pre
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0.pre
+- !ruby/object:Gem::Dependency
   name: cuba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.14'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: ruby-graphviz
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: forking
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
+  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
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: xmpp4r
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  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
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !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
-  version_requirements: *id018
-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.
+  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
-executables: 
+executables:
 - eye
 - loader_eye
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -379,48 +372,36 @@ 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
-has_rdoc: true
 homepage: http://github.com/kostya/eye
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 55
-      segments: 
-      - 1
-      - 9
-      - 2
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: 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.
+specification_version: 4
+summary: 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.
 test_files: []
-