metriks 0.9.6 → 0.9.7

data/lib/metriks.rb

@@ -1,6 +1,6 @@
 
 module Metriks
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 
   def self.get(name)
     Metriks::Registry.default.get(name)

data/lib/metriks/reporter/graphite.rb

@@ -11,7 +11,7 @@ module Metriks::Reporter
 
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
-      @on_errror = options[:on_error] || proc { |ex| }
+      @on_error  = options[:on_error] || proc { |ex| }
     end
 
     def socket

data/lib/metriks/reporter/librato_metrics.rb

@@ -11,7 +11,7 @@ module Metriks::Reporter
 
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
-      @on_errror = options[:on_error] || proc { |ex| }
+      @on_error  = options[:on_error] || proc { |ex| }
     end
 
     def start

data/lib/metriks/reporter/logger.rb

@@ -9,7 +9,7 @@ module Metriks::Reporter
 
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
-      @on_errror = options[:on_error] || proc { |ex| }
+      @on_error  = options[:on_error] || proc { |ex| }
     end
 
     def start

data/lib/metriks/reporter/proc_title.rb

@@ -5,7 +5,7 @@ module Metriks::Reporter
       @prefix   = options[:prefix]   || $0.dup
 
       @interval  = options[:interval] || 5
-      @on_errror = options[:on_error] || proc { |ex| }
+      @on_error  = options[:on_error] || proc { |ex| }
 
       @metrics  = []
     end
@@ -29,7 +29,7 @@ module Metriks::Reporter
               end
             end
           rescue Exception => ex
-            @on_errror[ex] rescue nil
+            @on_error[ex] rescue nil
           end
           sleep @interval
         end

data/metriks.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks'
-  s.version           = '0.9.6'
-  s.date              = '2012-03-19'
+  s.version           = '0.9.7'
+  s.date              = '2012-03-21'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -87,6 +87,7 @@ Gem::Specification.new do |s|
     test/registry_test.rb
     test/riemann_reporter_test.rb
     test/test_helper.rb
+    test/thread_error_handling_tests.rb
     test/timer_test.rb
     test/utilization_timer_test.rb
   ]

data/test/graphite_reporter_test.rb

@@ -1,11 +1,18 @@
 require 'test_helper'
+require 'thread_error_handling_tests'
 
 require 'metriks/reporter/graphite'
 
 class GraphiteReporterTest < Test::Unit::TestCase
+  include ThreadErrorHandlingTests
+
+  def build_reporter(options={})
+    Metriks::Reporter::Graphite.new('localhost', 3333, { :registry => @registry }.merge(options))
+  end
+
   def setup
     @registry = Metriks::Registry.new
-    @reporter = Metriks::Reporter::Graphite.new('localhost', 3333, :registry => @registry)
+    @reporter = build_reporter
     @stringio = StringIO.new
 
     @reporter.stubs(:socket).returns(@stringio)

data/test/librato_metrics_reporter_test.rb

@@ -1,11 +1,18 @@
 require 'test_helper'
+require 'thread_error_handling_tests'
 
 require 'metriks/reporter/librato_metrics'
 
 class LibratoMetricsReporterTest < Test::Unit::TestCase
+  include ThreadErrorHandlingTests
+
+  def build_reporter(options={})
+    Metriks::Reporter::LibratoMetrics.new('user', 'password', { :registry => @registry }.merge(options))
+  end
+
   def setup
     @registry = Metriks::Registry.new
-    @reporter = Metriks::Reporter::LibratoMetrics.new('user', 'password', :registry => @registry)
+    @reporter = build_reporter
   end
 
   def teardown

data/test/logger_reporter_test.rb

@@ -1,15 +1,22 @@
 require 'test_helper'
+require 'thread_error_handling_tests'
 
 require 'logger'
 require 'metriks/reporter/logger'
 
 class LoggerReporterTest < Test::Unit::TestCase
+  include ThreadErrorHandlingTests
+
+  def build_reporter(options={})
+    Metriks::Reporter::Logger.new({ :registry => @registry, :logger => @logger }.merge(options))
+  end
+
   def setup
     @stringio = StringIO.new
     @logger   = ::Logger.new(@stringio)
     @registry = Metriks::Registry.new
 
-    @reporter = Metriks::Reporter::Logger.new(:registry => @registry, :logger => @logger)
+    @reporter = build_reporter
 
     @registry.meter('meter.testing').mark
     @registry.counter('counter.testing').increment

data/test/riemann_reporter_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'thread_error_handling_tests'
 
 # riemann only works in 1.9
 if RUBY_VERSION > '1.9'
@@ -6,14 +7,20 @@ if RUBY_VERSION > '1.9'
 require 'metriks/reporter/riemann'
 
 class RiemannReporterTest < Test::Unit::TestCase
-  def setup
-    @registry = Metriks::Registry.new
-    @reporter = Metriks::Reporter::Riemann.new(
+  include ThreadErrorHandlingTests
+
+  def build_reporter(options={})
+    Metriks::Reporter::Riemann.new({
       :host => "foo",
       :port => 1234,
       :registry => @registry,
       :default_event => {:host => "h"}
-    )
+    }.merge(options))
+  end
+
+  def setup
+    @registry = Metriks::Registry.new
+    @reporter = build_reporter
   end
 
   def teardown

data/test/thread_error_handling_tests.rb

@@ -0,0 +1,20 @@
+module ThreadErrorHandlingTests
+  def test_passes_errors_in_thread_loop_to_on_error_handler
+    rescued_error = nil
+    error_handler_called = false
+    reporter = build_reporter(:interval => 0.0001, :on_error => lambda { |e|
+      error_handler_called = true
+      rescued_error = e
+    })
+
+    reporter.stubs(:write).raises(StandardError, "boom")
+
+    reporter.start
+    sleep 0.002
+    assert_equal true, error_handler_called
+    assert_equal "boom", rescued_error.message
+  ensure
+    reporter.stop
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-19 00:00:00 -07:00
+date: 2012-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - test/registry_test.rb
 - test/riemann_reporter_test.rb
 - test/test_helper.rb
+- test/thread_error_handling_tests.rb
 - test/timer_test.rb
 - test/utilization_timer_test.rb
 has_rdoc: true