eye 0.9.3 → 0.9.4.nosigar

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb55aab9464c85b0d2f52d9ecb83f2ef8f6cbc7
-  data.tar.gz: b36569fbe32ec49ece27216d1fbb340750a6116d
+  metadata.gz: df5b3035c5e2270e4314cf21f764d22b5f429221
+  data.tar.gz: 3385f97cff38b17f9f93e629b0c7dc94b05ad770
 SHA512:
-  metadata.gz: 1de45573f67e9a8b0b8a7a3d93ef19396d0561bcf780d73cb9eee63de3607958c1c634a6edd48556c95460492b407b05ee536cc5489974073f6618354b629cb2
-  data.tar.gz: 51c5d3ebd48ad1b339a493897a00fe354ee4d9b1c884c53ff198ba253d27a3216c909a248166d6c18591f06460becb0029fedc93db13bd0319953beded5ec94f
+  metadata.gz: fae4a420a72fcf37f906fe028313a77d5737b4050038db9e72eb76cc695f62001cc9a7fc6fa7f2631d9b9bb6abcdaca2a72bc6183d26b3451bb4afcbd03f28ca
+  data.tar.gz: e330bca5888e30957800455ace776f760154cf0e6388e48e380bb4b87af85a435cb0a00aca068e3740a0d4e71a679c838845fb6a68ea74f5155e99edfe243290

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.9.4
+----
+* leye used EYE_HOME under root
+
 0.9.3
 -----
 * fix process hangs in status :starting, in some rare cases

data/eye.gemspec

@@ -23,7 +23,6 @@ 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.3'
+  VERSION   = '0.9.4.nosigar'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2017 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
@@ -19,7 +19,6 @@ 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,7 +8,6 @@ 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 Sigar].map { |c| gem_version(c) },
+      gems: %w[Celluloid Celluloid::IO StateMachines NIO Timers].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,4 +7,3 @@ gem 'nio4r'
 gem 'timers'
 
 gem 'state_machines'
-gem 'sigar', '~> 0.7.3'

data/lib/eye/local.rb

@@ -7,7 +7,11 @@ module Eye::Local
     def dir
       @dir ||= begin
         if root?
-          '/var/run/eye'
+          if (_home = ENV['EYE_HOME']) && !_home.empty?
+            File.expand_path(File.join(_home, '.eye'))
+          else
+            '/var/run/eye'
+          end
         else
           File.expand_path(File.join(home, '.eye'))
         end

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: true,
+    check_identity: false,
     check_identity_period: 60.seconds,
     check_identity_grace: 60.seconds,
 

data/lib/eye/system.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4.nosigar
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -66,20 +66,6 @@ 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
@@ -434,7 +420,6 @@ 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

data/lib/eye/sigar.rb

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