freyr 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/freyr/cli/helpers.rb

@@ -81,14 +81,12 @@ module Freyr
         
         if args[:procinfo]
           begin
-            @proc_list ||= ProcessInfoList.new
-          
             pid = s.command.pid
-          
-            proc = @proc_list[pid.to_i]
-          
-            str << " CPU: #{proc.cpu}% - MEM: #{proc.mem}%" if proc
-          rescue => e
+            
+            proc = ProcessInfo[pid]
+            
+            str << " CPU: #{proc.pcpu}% - MEM: #{proc.mem_in_mb}mb" if proc
+          # rescue => e
           end
         end
         

data/lib/freyr/process_info.rb

@@ -1,5 +1,33 @@
 module Freyr
   class ProcessInfo
-    attr_accessor :user, :pid, :cpu, :mem, :vsz, :rss, :tt, :stat, :started, :time, :cmd
+    attr_reader :pid, :rss, :vsz, :pcpu, :pmem, :ruser, :command
+    def initialize pid
+      @pid = pid
+    end
+    
+    def ps
+      return if !pid || pid.to_s.empty?
+      info = `ps p #{pid} -o pid,rss,vsz,pmem,pcpu,ruser,command`
+      match = info.match(/#{pid}\s+(\d+)\s+(\d+)\s+([\d\.]+)\s+([\d\.]+)\s+(\w+)\s+(.+)/)
+      return unless match
+      @rss = match[1].to_i
+      @vsz = match[2].to_i
+      @pmem = match[3].to_f
+      @pcpu = match[4].to_f
+      @ruser = match[5]
+      @command = match[6]
+      info
+    end
+    
+    def mem_in_mb
+      @rss/1024
+    end
+    
+    class << self
+      def [] *args
+        n = new(*args)
+        n.ps ? n : nil
+      end
+    end
   end
-end
+end

data/lib/freyr.rb

@@ -4,6 +4,6 @@ module Freyr
   
 end
 
-%w{version service_info service_group service command pinger process_info process_info_list}.each do |f|
+%w{version service_info service_group service command pinger process_info}.each do |f|
   require File.expand_path(File.dirname(__FILE__)+"/freyr/#{f}.rb")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Tal Atlas
@@ -94,7 +94,6 @@ files:
 - lib/freyr/command.rb
 - lib/freyr/pinger.rb
 - lib/freyr/process_info.rb
-- lib/freyr/process_info_list.rb
 - lib/freyr/service.rb
 - lib/freyr/service_group.rb
 - lib/freyr/service_info.rb

data/lib/freyr/process_info_list.rb

@@ -1,32 +0,0 @@
-module Freyr
-  class ProcessInfoList
-    def initialize
-      ps = `ps aux`.chomp.split("\n")
-      ps.shift
-      
-      @processes = {}
-      ps.each do |proc|
-        proc = proc.split(/\s+/)
-        p = ProcessInfo.new
-        p.user = proc.shift
-        p.pid  = proc.shift
-        p.cpu  = proc.shift
-        p.mem  = proc.shift
-        p.vsz  = proc.shift
-        p.rss  = proc.shift
-        p.tt   = proc.shift
-        p.stat = proc.shift
-        p.started = proc.shift
-        p.time = proc.shift
-        p.cmd  = proc.join(' ')
-        
-        @processes[p.pid.to_i] = p
-      end
-    end
-    
-    def [] pid
-      @processes[pid.to_i]
-    end
-    
-  end
-end