ffwd-riemann 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2456bb4f5d30e6ea70d0071690e85be7b8a333
-  data.tar.gz: 77ce37d7d1f29422e697e92c8f16aaab28c6410d
+  metadata.gz: dfd54da83a92c993944beb2e205832e00ae730f6
+  data.tar.gz: 5ddc0cc8042aa417bf0322632fb5bc779bb8a3bf
 SHA512:
-  metadata.gz: 1299fff5191870586ec8138c3fbd8c88d71480b09154c5189d763447672abc71c68dcb0f21e5b814bba0f04f083eb80909580919d6eb0625366f80c86b561333
-  data.tar.gz: 35b5a8c936ee945b59246f3a44deb697c671b02bed38691f3e99e37ced43f512858949929fa93436b74af2eee722e9327585d60aac7d236a9017f7867cc46413
+  metadata.gz: 21b30d06d978bc6d268bd55957c1546433271d47207172edac23f3a105828bd4e48d5e181ec18b380cecfebcf9e5d3ddd00e1aaafdaf508b50e72176fbf0b39a
+  data.tar.gz: 7d1e02f9c6cc735160daaa12516226811554f8eb4fca89f0dedc31ddf7cc2764abd7933ae914f567d3ad0c2671bf85ea7322745a7c024e0f4d9535896d45120f

data/lib/ffwd/plugin/riemann/output.rb

@@ -19,23 +19,51 @@ module FFWD::Plugin::Riemann
   module Output
     def send_all events, metrics
       all_events = []
-      all_events += events.map{|e| make_event e} unless events.empty?
-      all_events += metrics.map{|m| make_metric m} unless metrics.empty?
+
+      events.each do |event|
+        begin
+          all_events << make_event(event)
+        rescue => error
+          output_failed_event event, error
+        end
+      end
+
+      metrics.each do |metric|
+        begin
+          all_events << make_metric(metric)
+        rescue => error
+          output_failed_metric metric, error
+        end
+      end
+
       return if all_events.empty?
+
       m = make_message :events => all_events
-      send_data encode(m)
+      send_data output_encode(m)
     end
 
     def send_event event
-      e = make_event event
+      begin
+        e = make_event event
+      rescue => error
+        output_failed_event event, error
+        return
+      end
+
       m = make_message :events => [e]
-      send_data encode(m)
+      send_data output_encode(m)
     end
 
     def send_metric metric
-      e = make_metric metric
+      begin
+        e = make_metric metric
+      rescue => error
+        output_failed_metric event, error
+        return
+      end
+
       m = make_message :events => [e]
-      send_data encode(m)
+      send_data output_encode(m)
     end
 
     def receive_data data
@@ -43,6 +71,13 @@ module FFWD::Plugin::Riemann
       return if message.ok
       @bad_acks = (@bad_acks || 0) + 1
     end
+
+    def output_encode message
+      raise "#output_encode: not implemented"
+    end
+
+    def output_failed_event event, error; end
+    def output_failed_metric metric, error; end
   end
 end
 

data/lib/ffwd/plugin/riemann/shared.rb

@@ -54,7 +54,7 @@ module FFWD::Plugin::Riemann
 
       e.attributes = source.map{|k, v|
         k = k.to_s.dup unless k.nil?
-        v = v.dup unless v.nil?
+        v = v.to_s.dup unless v.nil?
         ::Riemann::Attribute.new(:key => k, :value => v)
       }
     end

data/lib/ffwd/plugin/riemann/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Riemann
-      VERSION = "0.3.2"
+      VERSION = "0.3.3"
     end
   end
 end

data/lib/ffwd/plugin/riemann.rb

@@ -39,6 +39,7 @@ module FFWD::Plugin::Riemann
   register_plugin "riemann"
 
   class OutputTCP < FFWD::Handler
+    include FFWD::Logging
     include FFWD::Plugin::Riemann::Shared
     include FFWD::Plugin::Riemann::Output
 
@@ -46,12 +47,21 @@ module FFWD::Plugin::Riemann
       "riemann"
     end
 
-    def encode m
+    def output_encode m
       m.encode_with_length
     end
+
+    def output_failed_event event, error
+      log.error "Failed to send event #{event.inspect}: #{error}", error
+    end
+
+    def output_failed_metric metric, error
+      log.error "Failed to send metric #{metric.inspect}: #{error}", error
+    end
   end
 
   class OutputUDP < FFWD::Handler
+    include FFWD::Logging
     include FFWD::Plugin::Riemann::Shared
     include FFWD::Plugin::Riemann::Output
 
@@ -59,9 +69,17 @@ module FFWD::Plugin::Riemann
       "riemann"
     end
 
-    def encode m
+    def output_encode m
       m.encode
     end
+
+    def output_failed_event event, error
+      log.error "Failed to send event #{event.inspect}: #{error}", error
+    end
+
+    def output_failed_metric metric, error
+      log.error "Failed to send metric #{metric.inspect}: #{error}", error
+    end
   end
 
   class InputTCP < FFWD::Connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-riemann
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement