ganymed 0.4.3 → 0.4.4

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p194@ganymed
+rvm use --create ruby-1.9.3-p392@ganymed

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/lib/ganymed/collector.rb

@@ -53,6 +53,7 @@ module Ganymed
       collectors.each do |file|
         name = File.basename(file, '.rb')
         config = @config.collectors[name.to_sym] || Section.new
+        config.name = name
 
         log.debug("loading collector #{name} from #{file}")
         Plugin.new(config).from_file(file).tap do |collector|
@@ -90,6 +91,10 @@ module Ganymed
       # @return [Fixnum,Float]
       attr_accessor :interval
 
+      # Plugin splay
+      # @return [Fixnum]
+      attr_reader :splay
+
       # Create a new plugin instance.
       #
       # @param [Section] config  The configuration object.
@@ -103,6 +108,7 @@ module Ganymed
       # @return [void]
       def collect(interval=nil, &block)
         @interval = interval || config.interval.tap{} || 1
+        @splay = 0
         @collector = Proc.new(&block)
       end
 
@@ -110,18 +116,22 @@ module Ganymed
       # interval.
       # @return [void]
       def run
-        EM.add_periodic_timer(interval) do
-          EM.defer { collect! }
+        # we do not use a periodic timer here so that we can simply increase
+        # the splay to slow down the collector in case it throws lots of
+        # exceptions
+        EM.add_timer(interval * (2 ** splay)) do
+          EM.defer { collect!; run }
         end
       end
 
       # @private
       def collect!
-        begin
-          @collector.call if @collector.is_a?(Proc)
-        rescue Exception => exc
-          log.exception(exc)
-        end
+        @collector.call if @collector.is_a?(Proc)
+        @splay = 0
+      rescue Exception => exc
+        @splay += 1
+        log.exception(exc)
+        log.info("slowing down collector #{config.name}", interval: @interval, splay: @splay)
       end
 
       # Loads a given ruby file, and runs instance_eval against it in the

data/lib/ganymed/collectors/disk.rb

@@ -2,7 +2,7 @@ require 'sys/filesystem'
 
 collect do
   Sys::Filesystem.mounts do |mount|
-    st = Sys::Filesystem.stat(mount.mount_point)
+    st = Sys::Filesystem.stat(mount.mount_point) rescue next
     next if st.blocks == 0 or st.files == 0
 
     case mp = mount.mount_point

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 841601178190202909
+      hash: -2160081704488403590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,10 +231,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 841601178190202909
+      hash: -2160081704488403590
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ganymed is a daemon that collects Metriks from third-party applications