eye 0.4.2 → 0.5

data/lib/eye/sigar.rb

@@ -0,0 +1,5 @@
+require 'sigar'
+require 'logger'
+
+Eye::Sigar = ::Sigar.new
+Eye::Sigar.logger = ::Logger.new(nil)

data/lib/eye/system.rb

@@ -55,13 +55,15 @@ module Eye::System
     #   :environment
     #   :stdin, :stdout, :stderr
     def daemonize(cmd, cfg = {})
-      opts = spawn_options(cfg)
-      pid  = Process::spawn(prepare_env(cfg), *Shellwords.shellwords(cmd), opts)
-      Process.detach(pid)
+      pid = ::Process::spawn(prepare_env(cfg), *Shellwords.shellwords(cmd), spawn_options(cfg))
+
       {:pid => pid, :exitstatus => 0}
 
     rescue Errno::ENOENT, Errno::EACCES => ex
       {:error => ex}
+
+    ensure
+      Process.detach(pid) if pid
     end
 
     # Execute cmd with blocking, return status (be careful: inside actor blocks it mailbox, use with defer)
@@ -70,8 +72,7 @@ module Eye::System
     #   :environment
     #   :stdin, :stdout, :stderr
     def execute(cmd, cfg = {})
-      opts = spawn_options(cfg)
-      pid  = Process::spawn(prepare_env(cfg), *Shellwords.shellwords(cmd), opts)
+      pid = ::Process::spawn(prepare_env(cfg), *Shellwords.shellwords(cmd), spawn_options(cfg))
 
       timeout = cfg[:timeout] || 1.second
       status = 0
@@ -142,7 +143,7 @@ module Eye::System
       o.update(err: [config[:stderr], 'a']) if config[:stderr]
       o.update(in: config[:stdin]) if config[:stdin]
 
-      if Eye::Settings.root?
+      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]
       end

data/lib/eye/system_resources.rb

@@ -6,31 +6,33 @@ class Eye::SystemResources
   class << self
 
     def memory(pid)
-      ps_aux[pid].try :[], :rss
+      cache.proc_mem(pid).try(:resident)
     end
 
     def cpu(pid)
-      ps_aux[pid].try :[], :cpu
+      if cpu = cache.proc_cpu(pid)
+        cpu.percent * 100
+      end
     end
 
     def childs(parent_pid)
-      parent_pid = parent_pid.to_i
+      cache.childs(parent_pid)
+    end
 
-      childs = []
-      ps_aux.each do |pid, h|
-        childs << pid if h[:ppid] == parent_pid
+    def start_time(pid) # unixtime
+      if cpu = cache.proc_cpu(pid)
+        cpu.start_time.to_i / 1000
       end
-
-      childs
     end
 
-    def start_time(pid)
-      ps_aux[pid].try :[], :start_time
+    # total cpu usage in seconds
+    def cputime(pid)
+      if cpu = cache.proc_cpu(pid)
+        cpu.total.to_f / 1000
+      end
     end
 
     def resources(pid)
-      return {} unless ps_aux[pid]
-
       { :memory => memory(pid),
         :cpu => cpu(pid),
         :start_time => start_time(pid),
@@ -38,49 +40,52 @@ class Eye::SystemResources
       }
     end
 
-    # initialize actor, call 1 time before using
-    def setup
-      @actor ||= PsAxActor.new
-    end
-
-  private
-
-    def reset!
-      setup.terminate
-      @actor = nil
-    end
-
-    def ps_aux
-      setup
-      @actor.get
+    def cache
+      @cache ||= Cache.new
     end
-
   end
 
-  class PsAxActor
+  class Cache
     include Celluloid
 
-    UPDATE_INTERVAL = 5 # seconds
+    attr_reader :expire
 
     def initialize
-      set
+      clear
+      setup_expire
     end
 
-    def get
-      if @at + UPDATE_INTERVAL < Time.now
-        @at = Time.now # for minimize races
-        async.set
-      end
-      @ps_aux
+    def setup_expire(expire = 5)
+      @expire = expire
+      @timer.cancel if @timer
+      @timer = every(@expire) { clear }
     end
 
-  private
+    def clear
+      @memory = {}
+      @cpu = {}
+      @ppids = {}
+    end
 
-    def set
-      @ps_aux = Eye::System.ps_aux
-      @at = Time.now
+    def proc_mem(pid)
+      @memory[pid] ||= Eye::Sigar.proc_mem(pid) if pid
+
+    rescue ArgumentError # when incorrect PID
     end
 
+    def proc_cpu(pid)
+      @cpu[pid] ||= Eye::Sigar.proc_cpu(pid) if pid
+
+    rescue ArgumentError # when incorrect PID
+    end
+
+    def childs(pid)
+      if pid
+        @ppids[pid] ||= Eye::Sigar.proc_list("State.Ppid.eq=#{pid}")
+      else
+        []
+      end
+    end
   end
 
 end

data/lib/eye/trigger.rb

@@ -1,16 +1,16 @@
 class Eye::Trigger
+  include Eye::Dsl::Validation
+
   autoload :Flapping,   'eye/trigger/flapping'
-  autoload :State,      'eye/trigger/state'
+  autoload :Transition, 'eye/trigger/transition'
   autoload :StopChilds, 'eye/trigger/stop_childs'
 
   # ex: { :type => :flapping, :times => 2, :within => 30.seconds}
 
-  TYPES = {:flapping => "Flapping", :state => "State", :stop_childs => "StopChilds"}
+  TYPES = {:flapping => 'Flapping', :transition => 'Transition', :stop_childs => 'StopChilds'}
 
   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]
@@ -24,6 +24,9 @@ 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
+      Array(deps).each { |d| require d }
+    end
     klass
   end
 
@@ -59,8 +62,9 @@ class Eye::Trigger
     "trigger(#{@options[:type]})"
   end
 
-  def notify(transition)
+  def notify(transition, reason)
     debug "check (:#{transition.event}) :#{transition.from} => :#{transition.to}"
+    @reason = reason
     @transition = transition
 
     check(transition) if filter_transition(transition)
@@ -82,7 +86,7 @@ class Eye::Trigger
   end
 
   def check(transition)
-    raise "realize me"
+    raise 'realize me'
   end
 
   def run_in_process_context(p)
@@ -94,12 +98,15 @@ class Eye::Trigger
   end
 
   def self.register(base)
-    name = base.to_s.gsub("Eye::Trigger::", '')
+    name = base.to_s.gsub('Eye::Trigger::', '')
     type = name.underscore.to_sym
     Eye::Trigger::TYPES[type] = name
     Eye::Trigger.const_set(name, base)
   end
 
+  def self.depends_on
+  end
+
   class Custom < Eye::Trigger
     def self.inherited(base)
       super
@@ -120,4 +127,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/trigger/flapping.rb

@@ -32,7 +32,7 @@ private
   end
 
   def on_flapping
-    debug "flapping recognized!!!"
+    debug 'flapping recognized!!!'
 
     process.notify :error, 'flapping!'
     process.schedule :unmonitor, Eye::Reason.new(:flapping)

data/lib/eye/trigger/stop_childs.rb

@@ -3,7 +3,7 @@ class Eye::Trigger::StopChilds < Eye::Trigger
   param :timeout, [Fixnum, Float], nil, 60
 
   def check(trans)
-    debug "stop childs"
+    debug 'stop childs'
     process.childs.pmap { |pid, c| c.stop }
   end
 

data/lib/eye/trigger/transition.rb

@@ -0,0 +1,15 @@
+class Eye::Trigger::Transition < Eye::Trigger
+
+  # trigger :transition, :to => :up, :from => :starting, :do => ->{ ... }
+
+  param :do, [Proc, Symbol]
+
+  def check(trans)
+    act = @options[:do]
+    if act
+      instance_exec(&@options[:do]) if act.is_a?(Proc)
+      send(act, process) if act.is_a?(Symbol)
+    end
+  end
+
+end

data/lib/eye/utils.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Eye::Utils
   autoload :Tail,           'eye/utils/tail'
   autoload :AliveArray,     'eye/utils/alive_array'
@@ -11,4 +13,14 @@ module Eye::Utils
     end
   end
 
+  D1 = '%H:%M'
+  D2 = '%b%d'
+
+  def self.human_time(unix_time)
+    time = Time.at(unix_time.to_i)
+    d1 = time.to_date
+    d2 = Time.now.to_date
+    time.strftime (d1 == d2) ? D1 : D2
+  end
+
 end

data/lib/eye/utils/leak_19.rb

@@ -0,0 +1,7 @@
+# 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

data/lib/eye/utils/mini_active_support.rb

@@ -0,0 +1,106 @@
+require 'time'
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  def present?
+    !blank?
+  end
+
+  def try(m, *args)
+    send(m, *args) if respond_to?(m)
+  end
+end
+
+class NilClass
+  def try(*args)
+  end
+end
+
+class String
+  def underscore
+    word = self.dup
+    word.gsub!('::', '/')
+    word.gsub!(/(?:([A-Za-z\d])|^)((?=a)b)(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
+  def truncate(l)
+    self[0..l]
+  end
+end
+
+class Array
+  def extract_options!
+    self[-1].is_a?(Hash) ? self.pop : {}
+  end
+end
+
+class Numeric
+  def seconds
+    self
+  end
+  alias :second :seconds
+
+  def minutes
+    self * 60
+  end
+  alias :minute :minutes
+
+  def hours
+    self * 3600
+  end
+  alias :hour :hours
+
+  def days
+    self * 86400
+  end
+  alias :day :days
+
+  def weeks
+    self * 86400 * 7
+  end
+  alias :week :weeks
+
+  def ago
+    ::Time.now - self
+  end
+
+  def bytes
+    self
+  end
+  alias :byte :bytes
+
+  def kilobytes
+    self * 1024
+  end
+  alias :kilobyte :kilobytes
+
+  def megabytes
+    self * 1024 * 1024
+  end
+  alias :megabyte :megabytes
+
+  def gigabytes
+    self * 1024 * 1024 * 1024
+  end
+  alias :gigabyte :gigabytes
+
+  def terabytes
+    self * 1024 * 1024 * 1024 * 1024
+  end
+  alias :terabyte :terabytes
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: sigar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
         version: '0'
 description: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)
   >= 1.9.3-p194. Uses Celluloid and Celluloid::IO.
-email: kostya27@gmail.com
+email: eye-rb@googlegroups.com
 executables:
 - eye
 - loader_eye
@@ -284,13 +284,20 @@ files:
 - lib/eye/application.rb
 - lib/eye/checker.rb
 - lib/eye/checker/cpu.rb
+- lib/eye/checker/cputime.rb
 - lib/eye/checker/file_ctime.rb
 - lib/eye/checker/file_size.rb
+- lib/eye/checker/file_touched.rb
 - lib/eye/checker/http.rb
 - lib/eye/checker/memory.rb
 - lib/eye/checker/nop.rb
+- lib/eye/checker/runtime.rb
 - lib/eye/checker/socket.rb
 - lib/eye/child_process.rb
+- lib/eye/cli.rb
+- lib/eye/cli/commands.rb
+- lib/eye/cli/render.rb
+- lib/eye/cli/server.rb
 - lib/eye/client.rb
 - lib/eye/config.rb
 - lib/eye/control.rb
@@ -300,7 +307,6 @@ files:
 - lib/eye/controller/load.rb
 - lib/eye/controller/options.rb
 - lib/eye/controller/send_command.rb
-- lib/eye/controller/show_history.rb
 - lib/eye/controller/status.rb
 - lib/eye/dsl.rb
 - lib/eye/dsl/application_opts.rb
@@ -317,6 +323,7 @@ files:
 - lib/eye/group.rb
 - lib/eye/group/chain.rb
 - lib/eye/loader.rb
+- lib/eye/local.rb
 - lib/eye/logger.rb
 - lib/eye/notify.rb
 - lib/eye/notify/jabber.rb
@@ -338,17 +345,19 @@ files:
 - lib/eye/process/watchers.rb
 - lib/eye/reason.rb
 - lib/eye/server.rb
-- lib/eye/settings.rb
+- lib/eye/sigar.rb
 - lib/eye/system.rb
 - lib/eye/system_resources.rb
 - lib/eye/trigger.rb
 - lib/eye/trigger/flapping.rb
-- lib/eye/trigger/state.rb
 - lib/eye/trigger/stop_childs.rb
+- lib/eye/trigger/transition.rb
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb
 - lib/eye/utils/celluloid_chain.rb
 - lib/eye/utils/celluloid_klass.rb
+- lib/eye/utils/leak_19.rb
+- lib/eye/utils/mini_active_support.rb
 - lib/eye/utils/pmap.rb
 - lib/eye/utils/tail.rb
 homepage: http://github.com/kostya/eye