fluent-plugin-calc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1c071f135ee347fbda42cabebcf97145738e861
-  data.tar.gz: d96f235f6f89144c8c576be0a8502034355c6147
+  metadata.gz: c1a0fa5a4f57cb4b44e75759fdf27f0db87fe498
+  data.tar.gz: 994beab4aca4623426effc9fbd6d1d0e8dfcaf91
 SHA512:
-  metadata.gz: 10600118061e558c871707bff0c6d24c55aa2c6b3dea62c176a5ac0f2e317dc2d1dd116bf306c2f4a806e26510105a2b6ce5d4969b4ff349e1152b4e885a4019
-  data.tar.gz: 2ddf8699037167a5bd72aef1a3489d73487bbb75c1befd80c77cf2be0d60e3c70468eb45fbdba1efa6f52417926c69bd45bd117b1881eb48b610edd3af5aec7f
+  metadata.gz: e1a71b149904a8a9768d32ca86a1f632f2f31dad02a95bc421323db9807b014e10abe3f7c47bbec675982fcebc3db386131286f10b182af6406ad7baf4858e8a
+  data.tar.gz: b8b9562c574be42c7e984b4d7c67ad9064a8009984389890d4d336cfe95fa803882c2d461ea74bcebd5b25e9e35eb5eb39368e863cb2aca9d77a6192376bde7f

data/README.md

@@ -1,9 +1,11 @@
 # fluent-plugin-calc [![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-calc.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-calc) [![Dependency Status](https://gemnasium.com/sonots/fluent-plugin-calc.png)](https://gemnasium.com/sonots/fluent-plugin-calc) [![Coverage Status](https://coveralls.io/repos/sonots/fluent-plugin-calc/badge.png?branch=master)](https://coveralls.io/r/sonots/fluent-plugin-calc)
 
-Fluentd plugin to calc messages.
+Simple fluentd plugin to calculate messages.
 
 ## Configuration
 
+Example (sum for xxx_count, max for xxx_max, min for xxx_min, avg for xxx_avg): 
+
     <match foo.**>
       type calc
       interval 5s
@@ -20,7 +22,7 @@ Assuming following inputs are coming:
     foo.bar: {"4xx_count":1,"5xx_count":2","reqtime_max":12083,"reqtime_min":10,"reqtime_avg":240.46}
     foo.bar: {"4xx_count":4,"5xx_count":2","reqtime_max":24831,"reqtime_min":82,"reqtime_avg":300.46}
 
-then output bocomes as belows:
+then output bocomes as belows: 
 
     calc.foo.bar: {"4xx_count":5,"5xx_count":4","reqtime_max":24831,"reqtime_min":82,"reqtime_avg":270.46}
 

data/fluent-plugin-calc.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-calc"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Naotoshi SEO"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-calc"

data/lib/fluent/plugin/out_calc.rb

@@ -88,6 +88,8 @@ class Fluent::CalcOutput < Fluent::Output
     end
 
     chain.next
+  rescue => e
+    $log.warn "#{e.class} #{e.message} #{e.backtrace.first}"
   end
 
   # thread callback
@@ -96,10 +98,14 @@ class Fluent::CalcOutput < Fluent::Output
     @last_checked = Fluent::Engine.now
     while true
       sleep 0.5
-      if Fluent::Engine.now - @last_checked >= @interval
-        now = Fluent::Engine.now
-        flush_emit(now - @last_checked)
-        @last_checked = now
+      begin
+        if Fluent::Engine.now - @last_checked >= @interval
+          now = Fluent::Engine.now
+          flush_emit(now - @last_checked)
+          @last_checked = now
+        end
+      rescue => e
+        $log.warn "#{e.class} #{e.message} #{e.backtrace.first}"
       end
     end
   end
@@ -119,6 +125,7 @@ class Fluent::CalcOutput < Fluent::Output
   end
 
   def generate_output(count, matches)
+    return nil if matches.empty?
     output = matches.dup
     output.keys.each do |key|
       if @avg and @avg.match(key)

data/spec/out_calc_spec.rb

@@ -69,7 +69,6 @@ describe Fluent::CalcOutput do
     let(:messages) do
       [
         {"4xx_count"=>1,"5xx_count"=>2,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3},
-        {">4sec_count"=>1},
         {"4xx_count"=>2,"5xx_count"=>2,"reqtime_max"=>5,"reqtime_min"=>2,"reqtime_avg"=>2},
         {"4xx_count"=>3,"5xx_count"=>2,"reqtime_max"=>1,"reqtime_min"=>3,"reqtime_avg"=>4},
       ]
@@ -140,6 +139,9 @@ describe Fluent::CalcOutput do
           aggregate all
           tag foo
           sum _count$
+          max _max$
+          min _min$
+          avg _avg$
         ]
         end
         before do
@@ -157,6 +159,9 @@ describe Fluent::CalcOutput do
           aggregate tag
           add_tag_prefix calc
           sum _count$
+          max _max$
+          min _min$
+          avg _avg$
           ]
         end
         before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-calc
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: fluentd plugin to calc messages