astro-collectd 0.0.8 → 0.0.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 8
+:patch: 9
 :major: 0

data/examples/em_sender.rb

@@ -4,11 +4,13 @@ require 'collectd'
 EM.run do
   Collectd::use_eventmachine = true
   Collectd::add_server 1
+  Stats = Collectd.ruby_collectd(:test)
+  Stats.with_full_proc_stats
 
   c = 0
   EM.add_periodic_timer(0.01) do
-    Collectd.ruby_collectd(:test).ping(:fun).gauge = 42 + Math.sin(Time.now.to_f / 600) * 23.5
-    Collectd.ruby_collectd(:test).cpu(:time).counter = c
+    Stats.ping(:fun).gauge = 42 + Math.sin(Time.now.to_f / 600) * 23.5
+    Stats.cpu(:time).counter = c
 
     c += 1
     print '.'

data/examples/sender.rb

@@ -1,12 +1,15 @@
 require 'collectd'
 
 Collectd::add_server 1
+Stats = Collectd::ruby_collectd(:test)
+Stats.with_full_proc_stats
 
 c = 0
 loop do
-  Collectd.ruby_collectd(:test).ping(:fun).gauge = 42 + Math.sin(Time.now.to_f / 600) * 23.5
-  Collectd.ruby_collectd(:test).cpu(:time).counter = c
+  Stats.ping(:fun).gauge = 42 + Math.sin(Time.now.to_f / 600) * 23.5
+  Stats.cpu(:time).counter = c
   c += 1
+  Thread.pass
   sleep 0.01
   print '.'
   STDOUT.flush

data/lib/collectd/proc_stats.rb

@@ -20,10 +20,10 @@ module Collectd
 
     def with_polled_memory
       memory('VmRSS').polled_gauge do
-        v = process_status('VmRSS') ? v.to_i * 1024 : nil
+        (v = process_status('VmRSS')) ? v.to_i * 1024 : nil
       end
       memory('VmSize').polled_gauge do
-        v = process_status('VmSize') ? v.to_i * 1024 : nil
+        (v = process_status('VmSize')) ? v.to_i * 1024 : nil
       end
 
       self
@@ -33,7 +33,7 @@ module Collectd
       cpu('user').polled_counter do
         (Process::times.utime * 100).to_i
       end
-      cpu('sys').polled_counter do
+      cpu('system').polled_counter do
         (Process::times.stime * 100).to_i
       end
     end

data/spec/interface_spec.rb

@@ -97,7 +97,7 @@ describe Collectd::ProcStats do
       c[0].should be_kind_of(Fixnum)
     end
     it 'should report system time' do
-      c = @server.counters[[:plugin1, :plugin_instance1, :cpu, "sys"]]
+      c = @server.counters[[:plugin1, :plugin_instance1, :cpu, "system"]]
       c[0].should be_kind_of(Fixnum)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-collectd
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Stephan Maka