eye 0.9.1 → 0.9.2.nosigar

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76b8d9060cb42b041484705984a1a7f3da93b38
-  data.tar.gz: ca3823da4f96ff0935b83687a1c1ef06716a1fbe
+  metadata.gz: 6f1f98d5fe3b366203e2e2e969373559e9f17085
+  data.tar.gz: 8b512175c809fac3f0995eff1e03a2875d5b411f
 SHA512:
-  metadata.gz: 10f87c6c0916bd8384d736c23673821c4e9ba06af76ae51293e95b451319bfec6dfe9fac50aec8903cc26679143e2b2fcd47352ade2132efdbe4d656de3a65ac
-  data.tar.gz: 36bded5d52f33ff52ee0908bb16fe57c5a0afab6d8d608138fd2b398b3deb3212f4772f2c26598c6c667a81a0969e05520b39225e69955ba3ae75e618c780eac
+  metadata.gz: 55db19635e608199650d052b64880feec83792ad5f5f6fb4d30fdee5e91e4354adf6237ba773ca15971f0ea5ba920363c4df2a2ce72dba27a5a0a3f378f5dd14
+  data.tar.gz: dab9c2f17dca1e52c6e9070d2c434cff23a01c5f1e8f57104b512c520862c2771835e6172c8d28d1040868c1bc77b9328480b6d58d02871a778ed49948525d44

data/Rakefile

@@ -1,7 +1,6 @@
 #!/usr/bin/env rake
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
@@ -23,10 +22,6 @@ task :split_test do
   abort unless system(cmd)
 end
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-end
-
 task :remove_coverage do
   require 'fileutils'
   FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), %w{ coverage })))

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.1'
+  VERSION   = '0.9.2.nosigar'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2016 @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/application.rb

@@ -35,8 +35,7 @@ class Eye::Application
     { name: @name, type: :application, subtree: @groups.map(&:status_data_short) }
   end
 
-  def debug_data
-  end
+  def debug_data; end
 
   def send_call(call)
     info "call: #{call}"

data/lib/eye/child_process.rb

@@ -57,8 +57,7 @@ class Eye::ChildProcess
     state == :up
   end
 
-  def start
-  end
+  def start; end
 
   def stop
     kill_process
@@ -72,14 +71,11 @@ class Eye::ChildProcess
     end
   end
 
-  def monitor
-  end
+  def monitor; end
 
-  def unmonitor
-  end
+  def unmonitor; end
 
-  def delete
-  end
+  def delete; end
 
   def destroy
     remove_watchers

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/logger.rb

@@ -24,8 +24,7 @@ class Eye::Logger
       [Class, Module].include?(self.class) ? to_s : "<#{self.class}>"
     end
 
-    def logger_sub_tag
-    end
+    def logger_sub_tag; end
 
     def logger
       @logger ||= Eye::Logger.new(logger_tag, logger_sub_tag)

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/server.rb

@@ -36,7 +36,6 @@ class Eye::Server
       begin
         sign, msg_size = text[0...8].unpack('N*')
         raise "unknown protocol #{sign}" unless sign == Eye::Client::SIGN
-        msg_size = text[4...8].unpack('N')[0]
         content = text[8..-1]
         content << socket.read(msg_size - content.length) while content.length < msg_size
         payload = Marshal.load(content)

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,14 +7,12 @@ 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)
@@ -22,23 +20,21 @@ class Eye::SystemResources
     end
 
     def start_time(pid) # unixtime
-      if cpu = cache.proc_cpu(pid)
-        cpu.start_time.to_i / 1000
+      if st = cache.proc_start_time(pid)
+        Time.parse(st).to_i
       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
@@ -57,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)
@@ -92,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

data/lib/eye/utils.rb

@@ -52,7 +52,7 @@ module Eye::Utils
       e = e.gsub(%r[#.+$], '').strip
       next unless e.include?('=')
       k, v = e.split('=', 2)
-      h[k] = v
+      h[k] = v.gsub(%r/^["']+(.*)["']+$/, '\1')
     end
     h
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2.nosigar
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-05-03 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)