eye 0.9.2.nosigar → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1f98d5fe3b366203e2e2e969373559e9f17085
-  data.tar.gz: 8b512175c809fac3f0995eff1e03a2875d5b411f
+  metadata.gz: bc90dbe500dcdec39abb07eed2c8a9391cb8e619
+  data.tar.gz: b0c7fe91dad6d81afa03467fa4af801e9a8cd619
 SHA512:
-  metadata.gz: 55db19635e608199650d052b64880feec83792ad5f5f6fb4d30fdee5e91e4354adf6237ba773ca15971f0ea5ba920363c4df2a2ce72dba27a5a0a3f378f5dd14
-  data.tar.gz: dab9c2f17dca1e52c6e9070d2c434cff23a01c5f1e8f57104b512c520862c2771835e6172c8d28d1040868c1bc77b9328480b6d58d02871a778ed49948525d44
+  metadata.gz: 3211c83195c0fccacbe73705a2f822079f2cdeecfa1ab5b1aa43587574ed2fe7369a60b2ca2a5365a4fdaba97f3d1330bbd4c280e607f35140d84ea954984b81
+  data.tar.gz: 5e7cab54e3f1ceae0d3edf0f54e73976b24c61258f1e770508a1be20ae7b87c12acd9edef70212bf2e85c6f7efbaa1c617e1aeb627ec07db40b28b688981ad37

data/eye.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'celluloid-io',  '~> 0.17.0'
   gem.add_dependency 'state_machines'
   gem.add_dependency 'thor'
+  gem.add_dependency 'sigar', '~> 0.7.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '< 2.14'

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = '0.9.2.nosigar'
+  VERSION   = '0.9.2'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2016 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
@@ -19,6 +19,7 @@ module Eye
   autoload :Utils,          'eye/utils'
   autoload :Notify,         'eye/notify'
   autoload :Config,         'eye/config'
+  autoload :Sigar,          'eye/sigar'
   autoload :Controller,     'eye/controller'
   autoload :Control,        'eye/control'
   autoload :Cli,            'eye/cli'

data/lib/eye/controller.rb

@@ -8,6 +8,7 @@ require_relative 'utils/mini_active_support'
 Object.send(:include, Eye::Logger::ObjectExt)
 
 # needs to preload
+Eye::Sigar
 Eye::SystemResources
 
 class Eye::Controller

data/lib/eye/controller/status.rb

@@ -9,7 +9,7 @@ module Eye::Controller::Status
       about: Eye::ABOUT,
       resources: Eye::SystemResources.resources($$),
       ruby: RUBY_DESCRIPTION,
-      gems: %w[Celluloid Celluloid::IO StateMachines NIO Timers].map { |c| gem_version(c) },
+      gems: %w[Celluloid Celluloid::IO StateMachines NIO Timers Sigar].map { |c| gem_version(c) },
       logger: Eye::Logger.args.present? ? [Eye::Logger.dev.to_s, *Eye::Logger.args] : Eye::Logger.dev.to_s,
       home: Eye::Local.home,
       dir: Eye::Local.dir,

data/lib/eye/loader.rb

@@ -7,3 +7,4 @@ gem 'nio4r'
 gem 'timers'
 
 gem 'state_machines'
+gem 'sigar', '~> 0.7.3'

data/lib/eye/process/config.rb

@@ -4,7 +4,7 @@ module Eye::Process::Config
     keep_alive: true, # restart when crashed
     check_alive_period: 5.seconds,
 
-    check_identity: false,
+    check_identity: true,
     check_identity_period: 60.seconds,
     check_identity_grace: 60.seconds,
 

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

@@ -140,26 +140,6 @@ module Eye::System
       env
     end
 
-    PS_AUX_CMD = if RUBY_PLATFORM.include?('darwin')
-      'ps axo pid,ppid,pcpu,rss,start'
-    else
-      'ps axo pid,ppid,pcpu,rss,start_time'
-    end
-
-    # get table
-    # {pid => {:rss =>, :cpu =>, :ppid => , :start_time => }}
-    # slow
-    def ps_aux
-      str = Process.send('`', PS_AUX_CMD).force_encoding('binary')
-      h = {}
-      str.each_line do |line|
-        chunk = line.strip.split(%r[\s+])
-        h[chunk[0].to_i] = { ppid: chunk[1].to_i, cpu: chunk[2].to_i,
-                             rss: chunk[3].to_i, start_time: chunk[4] }
-      end
-      h
-    end
-
   end
 
 end

data/lib/eye/system_resources.rb

@@ -7,12 +7,14 @@ class Eye::SystemResources
 
     def memory(pid)
       if mem = cache.proc_mem(pid)
-        mem * 1024
+        mem.resident
       end
     end
 
     def cpu(pid)
-      cache.proc_cpu(pid)
+      if cpu = cache.proc_cpu(pid)
+        cpu.percent * 100
+      end
     end
 
     def children(parent_pid)
@@ -20,21 +22,23 @@ class Eye::SystemResources
     end
 
     def start_time(pid) # unixtime
-      if st = cache.proc_start_time(pid)
-        Time.parse(st).to_i
+      if cpu = cache.proc_cpu(pid)
+        cpu.start_time.to_i / 1000
       end
     end
 
     # total cpu usage in seconds
-    def cputime(_pid)
-      0
+    def cputime(pid)
+      if cpu = cache.proc_cpu(pid)
+        cpu.total.to_f / 1000
+      end
     end
 
     # last child in a children tree
     def leaf_child(pid)
       if dc = deep_children(pid)
         dc.detect do |child|
-          args = ''
+          args = Eye::Sigar.proc_args(child)[0] rescue ''
           !args.start_with?('logger') && child != pid
         end
       end
@@ -53,8 +57,8 @@ class Eye::SystemResources
       end
     end
 
-    def args(_pid)
-      '-'
+    def args(pid)
+      Eye::Sigar.proc_args(pid).join(' ').strip rescue '-'
     end
 
     def resources(pid)
@@ -88,34 +92,31 @@ class Eye::SystemResources
     end
 
     def clear
-      @ps_aux = nil
+      @memory = {}
+      @cpu = {}
+      @ppids = {}
     end
 
     def proc_mem(pid)
-      ps_aux[pid].try :[], :rss
+      @memory[pid] ||= Eye::Sigar.proc_mem(pid) if pid
+
+    rescue ArgumentError
+      # when incorrect PID, just skip
     end
 
     def proc_cpu(pid)
-      ps_aux[pid].try :[], :cpu
-    end
+      @cpu[pid] ||= Eye::Sigar.proc_cpu(pid) if pid
 
-    def proc_start_time(pid)
-      ps_aux[pid].try :[], :start_time
+    rescue ArgumentError
+      # when incorrect PID, just skip
     end
 
-    def children(parent_pid)
-      parent_pid = parent_pid.to_i
-
-      childs = []
-      ps_aux.each do |pid, h|
-        childs << pid if h[:ppid] == parent_pid
+    def children(pid)
+      if pid
+        @ppids[pid] ||= Eye::Sigar.proc_list("State.Ppid.eq=#{pid}")
+      else
+        []
       end
-
-      childs
-    end
-
-    def ps_aux
-      @ps_aux ||= defer { Eye::System.ps_aux }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.9.2.nosigar
+  version: 0.9.2
 platform: ruby
 authors:
 - Konstantin Makarchev
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sigar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +434,7 @@ files:
 - lib/eye/process/validate.rb
 - lib/eye/process/watchers.rb
 - lib/eye/server.rb
+- lib/eye/sigar.rb
 - lib/eye/system.rb
 - lib/eye/system_resources.rb
 - lib/eye/trigger.rb