collectd 0.0.12 → 0.0.15

data/README.rst

@@ -26,13 +26,16 @@ port `25826` (so it's acting as a server):
   </Plugin>
 
 
-To install the gem, make sure GitHub's RubyGems server is known to your local 
-RubyGems, then install it:
+To install the gem, make sure the Gemcutter RubyGems server is known to your 
+local RubyGems, then install it:
 
 ::
    
-  gem sources -a http://gems.github.com
-  sudo gem install astro-collectd
+  gem sources -a http://gemcutter.org
+  gem install collectd
+
+Add ``sudo`` in front of the ``gem install`` command if you want it to be 
+installed system wide. 
 
 
 Usage

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 12
+:patch: 15
 :major: 0
+:build: 
 :minor: 0

data/lib/collectd/em_server.rb

@@ -10,9 +10,7 @@ module Collectd
 
       EM.add_periodic_timer(interval) do
         Collectd.run_pollables_for self
-        Thread.critical = true
         pkt = make_pkt
-        Thread.critical = false
         begin
           @sock.send(pkt, 0)
         rescue SystemCallError

data/lib/collectd/interface.rb

@@ -140,72 +140,88 @@ module Collectd
       @interval = interval
       @counters = {}
       @gauges = {}
+      @lock = Mutex.new
     end
     def set_counter(plugin_type, values)
-      @counters[plugin_type] = values
+      @lock.synchronize do
+        @counters[plugin_type] = values
+      end
     end
     def inc_counter(plugin_type, values)
-      old_values = @counters[plugin_type] || []
-      values.map! { |value|
-        value + (old_values.shift || 0)
-      }
-      @counters[plugin_type] = values
+      @lock.synchronize do
+        old_values = @counters[plugin_type] || []
+        values.map! { |value|
+          value + (old_values.shift || 0)
+        }
+        @counters[plugin_type] = values
+      end
     end
     def set_gauge(plugin_type, values)
-      # Use count & sums for average
-      if @gauges.has_key?(plugin_type)
-        old_values = @gauges[plugin_type]
-        count = old_values.shift || 0
-        values.map! { |value| value + (old_values.shift || value) }
-        @gauges[plugin_type] = [count + 1] + values
-      else
-        @gauges[plugin_type] = [1] + values
+      @lock.synchronize do
+        # Use count & sums for average
+        if @gauges.has_key?(plugin_type)
+          old_values = @gauges[plugin_type]
+          count = old_values.shift || 0
+          values.map! { |value| value + (old_values.shift || value) }
+          @gauges[plugin_type] = [count + 1] + values
+        else
+          @gauges[plugin_type] = [1] + values
+        end
       end
     end
 
     def make_pkt
-      plugin_type_values = {}
-      @counters.each do |plugin_types,values|
-        plugin, plugin_instance, type, type_instance = plugin_types
-        plugin_type_values[plugin] ||= {}
-        plugin_type_values[plugin][plugin_instance] ||= {}
-        plugin_type_values[plugin][plugin_instance][type] ||= {}
-        plugin_type_values[plugin][plugin_instance][type][type_instance] =
-        Packet::Values.new(values.map { |value| Packet::Values::Counter.new(value) })
-      end
-      @gauges.each do |plugin_types,values|
-        plugin, plugin_instance, type, type_instance = plugin_types
-        plugin_type_values[plugin] ||= {}
-        plugin_type_values[plugin][plugin_instance] ||= {}
-        plugin_type_values[plugin][plugin_instance][type] ||= {}
-        count = values.shift || next
-        values.map! { |value| value.to_f / count }
-        plugin_type_values[plugin][plugin_instance][type][type_instance] =
-          Packet::Values.new(values.map { |value| Packet::Values::Gauge.new(value) })
-      end
-      pkt = [Packet::Host.new(Collectd.hostname),
-             Packet::Time.new(Time.now.to_i),
-             Packet::Interval.new(10)]
-      plugin_type_values.each do |plugin,plugin_instances|
-        pkt << Packet::Plugin.new(plugin)
-        plugin_instances.each do |plugin_instance,types|
-          pkt << Packet::PluginInstance.new(plugin_instance)
-          types.each do |type,type_instances|
-            pkt << Packet::Type.new(type)
-            type_instances.each do |type_instance,values|
-              pkt << Packet::TypeInstance.new(type_instance)
-              pkt << values
+      @lock.synchronize do
+        pkt = nil
+        @plugin_type_values = {}
+
+        @counters.each do |plugin_types,values|
+          packet_values = Packet::Values.new(values.map { |value| Packet::Values::Counter.new(value) })
+          populate_plugin_type_values(plugin_types, packet_values)
+        end
+
+        @gauges.each do |plugin_types,values|
+          count = values.shift || next
+          values.map! { |value| value.to_f / count }
+          packet_values = Packet::Values.new(values.map { |value| Packet::Values::Gauge.new(value) })
+          populate_plugin_type_values(plugin_types, packet_values)
+        end
+
+        pkt = [Packet::Host.new(Collectd.hostname),
+               Packet::Time.new(Time.now.to_i),
+               Packet::Interval.new(10)]
+
+        @plugin_type_values.each do |plugin,plugin_instances|
+          pkt << Packet::Plugin.new(plugin)
+          plugin_instances.each do |plugin_instance,types|
+            pkt << Packet::PluginInstance.new(plugin_instance)
+            types.each do |type,type_instances|
+              pkt << Packet::Type.new(type)
+              type_instances.each do |type_instance,values|
+                pkt << Packet::TypeInstance.new(type_instance)
+                pkt << values
+              end
             end
           end
         end
-      end
 
-      # Reset only gauges. Counters are persistent for incrementing.
-      @gauges = {}
+        # Reset only gauges. Counters are persistent for incrementing.
+        @gauges = {}
 
-      # And return serialized packet of parts
-      pkt.to_s
+        # And return serialized packet of parts
+        pkt.join
+      end
     end
+
+    private
+    def populate_plugin_type_values(plugin_types, packet_values)
+      plugin, plugin_instance, type, type_instance = plugin_types
+      @plugin_type_values[plugin] ||= {}
+      @plugin_type_values[plugin][plugin_instance] ||= {}
+      @plugin_type_values[plugin][plugin_instance][type] ||= {}
+      @plugin_type_values[plugin][plugin_instance][type][type_instance] = packet_values
+    end
+
   end
 
 end

data/lib/collectd/server.rb

@@ -14,9 +14,7 @@ module Collectd
           sleep interval
 
           Collectd.run_pollables_for self
-          Thread.critical = true
           pkt = make_pkt
-          Thread.critical = false
           begin
             @sock.send(pkt, 0)
           rescue SystemCallError

data/spec/interface_spec.rb

@@ -1,7 +1,7 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require 'collectd'
 
-describe Collectd do
+describe "Collectd" do
   before(:each) do
     @server = mock('Server')
     Collectd << @server
@@ -90,10 +90,12 @@ describe Collectd::ProcStats do
       g = @server.gauges[[:plugin1, :plugin_instance1, :memory, "VmRSS"]]
       g[0].should be_kind_of(Fixnum)
     end
+    
     it 'should report VmSize' do
       g = @server.gauges[[:plugin1, :plugin_instance1, :memory, "VmSize"]]
       g[0].should be_kind_of(Fixnum)
     end
+    
   end
   context 'when polling cpu' do
     it 'should report user time' do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: collectd
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +02:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -45,25 +51,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Send collectd statistics from Ruby
 test_files: 
 - spec/interface_spec.rb
-- examples/sender.rb
 - examples/em_sender.rb
+- examples/sender.rb