reel-eye 0.4.1 → 0.5

data/lib/eye/group.rb

@@ -114,7 +114,7 @@ class Eye::Group
   end
 
   def break_chain
-    info "break chain"
+    info 'break chain'
     scheduler_clear_pending_list
     @chain_breaker = true
   end

data/lib/eye/http.rb

@@ -1,7 +1,8 @@
-gem 'reel', '~> 0.4.0.pre'
+gem 'reel', '~> 0.4.0'
+gem 'reel-rack'
 gem 'cuba'
 
-require 'reel'
+require 'reel/rack/server'
 
 class Eye::Http
   autoload :Router,   'eye/http/router'
@@ -16,13 +17,7 @@ class Eye::Http
 
   def start
     stop
-
-    @server = Reel::Server.supervise(@host, @port) do |connection|
-      while request = connection.request
-        status, headers, body = @router.call(Rack::MockRequest.env_for(request.url, :method => request.method, :input => request.body))
-        connection.respond(Reel::Response.new(status, headers, body))
-      end
-    end
+    @server = Reel::Rack::Server.supervise(@router, :Host => @host, :Port => port)
   end
 
   def stop

data/lib/eye/http/router.rb

@@ -13,7 +13,7 @@ Eye::Http::Router = Cuba.new do
   end
 
   on "api/info", param("filter") do |filter|
-    json Eye::Control.command(:raw_info, filter)
+    json Eye::Control.command(:info_data, filter)
   end
 
   [:start, :stop, :restart, :delete, :unmonitor, :monitor].each do |act|

data/lib/eye/loader.rb

@@ -1,14 +1,10 @@
-# mini bundler, for embedded server gem installation
+# add gems to $: by `gem` method
+#  this is only way when install eye as system wide
 
-gem 'celluloid',     '~> 0.14.0'
-gem 'celluloid-io',  '~> 0.14.0'
+gem 'celluloid',     '~> 0.15.0'
+gem 'celluloid-io',  '~> 0.15.0'
 gem 'nio4r'
 gem 'timers'
 
 gem 'state_machine'
-
-if RUBY_VERSION == '1.9.2'
-  gem 'activesupport', '>= 3', '< 4.0'
-else
-  gem 'activesupport', '>= 3'
-end
+gem 'sigar',         '~> 0.7.2'

data/lib/eye/{settings.rb → local.rb}

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-module Eye::Settings
+module Eye::Local
   module_function
 
   def dir

data/lib/eye/logger.rb

@@ -56,6 +56,7 @@ class Eye::Logger
     attr_reader :dev, :log_level
 
     def link_logger(dev)
+      old_dev = @dev
       @dev = dev ? dev.to_s : nil
       @dev_fd = @dev
 
@@ -64,6 +65,10 @@ class Eye::Logger
 
       @inner_logger = InnerLogger.new(@dev_fd)
       @inner_logger.level = self.log_level || Logger::INFO
+
+    rescue Errno::ENOENT, Errno::EACCES
+      @dev = old_dev
+      raise
     end
 
     def log_level=(level)

data/lib/eye/notify.rb

@@ -1,15 +1,18 @@
 class Eye::Notify
   include Celluloid
-  extend Eye::Dsl::Validation
+  include Eye::Dsl::Validation
 
   autoload :Mail,     'eye/notify/mail'
   autoload :Jabber,   'eye/notify/jabber'
 
-  TYPES = {:mail => "Mail", :jabber => "Jabber"}
+  TYPES = {:mail => 'Mail', :jabber => 'Jabber'}
 
   def self.get_class(type)
     klass = eval("Eye::Notify::#{TYPES[type]}") rescue nil
     raise "Unknown notify #{type}" unless klass
+    if deps = klass.depends_on
+      Array(deps).each { |d| require d }
+    end
     klass
   end
 
@@ -71,7 +74,7 @@ class Eye::Notify
   end
 
   def execute
-    raise "realize me"
+    raise 'realize me'
   end
 
   param :contact, [String]
@@ -81,17 +84,20 @@ class Eye::Notify
   end
 
   def message_body
-    "#{message_subject} at #{msg_at.to_s(:short)}"
+    "#{message_subject} at #{msg_at.strftime(Eye::Cli::Render::DF)}"
   end
 
   def self.register(base)
-    name = base.to_s.gsub("Eye::Notify::", '')
+    name = base.to_s.gsub('Eye::Notify::', '')
     type = name.underscore.to_sym
     Eye::Notify::TYPES[type] = name
     Eye::Notify.const_set(name, base)
     Eye::Dsl::ConfigOpts.add_notify(type)
   end
 
+  def self.depends_on
+  end
+
   class Custom < Eye::Notify
     def self.inherited(base)
       super
@@ -107,4 +113,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/notify/jabber.rb

@@ -1,3 +1,5 @@
+require 'xmpp4r'
+
 class Eye::Notify::Jabber < Eye::Notify
 
   # Eye.config do
@@ -11,8 +13,6 @@ class Eye::Notify::Jabber < Eye::Notify
   param :password, String
 
   def execute
-    require 'xmpp4r'
-
     debug "send jabber #{[host, port, user, password]} - #{[contact, message_body]}"
 
     mes = ::Jabber::Message.new(contact, message_body)

data/lib/eye/process/child.rb

@@ -6,8 +6,9 @@ module Eye::Process::Child
 
   def add_or_update_childs
     return unless self[:monitor_children]
-
     return unless self.up?
+    return if @updating_childs
+    @updating_childs = true
 
     unless self.pid
       warn 'Cant add childs, because no pid'
@@ -41,6 +42,7 @@ module Eye::Process::Child
     h = {:new => new_childs.size, :removed => removed_childs.size, :exists => exist_childs.size }
     debug "childs info: #{ h.inspect }"
 
+    @updating_childs = false
     h
   end
 

data/lib/eye/process/commands.rb

@@ -88,7 +88,7 @@ private
 
   def kill_process
     unless self.pid
-      error "try to kill process without pid"
+      error 'try to kill process without pid'
       return
     end
 
@@ -145,7 +145,7 @@ private
 
   def execute_restart_command
     unless self.pid
-      error "try to execute restart_command without pid"
+      error 'try to execute restart_command without pid'
       return
     end
 

data/lib/eye/process/controller.rb

@@ -43,7 +43,7 @@ module Eye::Process::Controller
         info "process from pid_file(#{self.pid}) found and already running, so :up"
         switch :already_running
       else
-        warn "process not found, so :unmonitor"
+        warn 'process not found, so :unmonitor'
         schedule :unmonitor, Eye::Reason.new(:'not found')
       end
     end

data/lib/eye/process/trigger.rb

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

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
@@ -156,7 +157,7 @@ module Eye::System
       env = {}
 
       (config[:environment] || {}).each do |k,v|
-        env[k.to_s] = v.to_s if v
+        env[k.to_s] = v && v.to_s
       end
 
       env

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