fluent-plugin-datacounter 0.1.1 → 0.2.0

data/README.rdoc

@@ -51,7 +51,8 @@ HTTP status code patterns.
 
     <match accesslog.**>
       type datacounter
-      unit minute
+      count_interval 1m    # just same as 'unit minute' and 'count_interval 60s'
+                           # you can also specify '30s', '5m', '2h' ....
       count_key status
       # patternX: X(1-9)
       pattern1 2xx ^2\d\d$

data/fluent-plugin-datacounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-datacounter"
-  s.version     = "0.1.1"
+  s.version     = "0.2.0"
   s.authors     = ["TAGOMORI Satoshi"]
   s.email       = ["tagomoris@gmail.com"]
   s.homepage    = "https://github.com/tagomoris/fluent-plugin-datacounter"

data/lib/fluent/plugin/out_datacounter.rb

@@ -1,6 +1,7 @@
 class Fluent::DataCounterOutput < Fluent::Output
   Fluent::Plugin.register_output('datacounter', self)
 
+  config_param :count_interval, :time, :default => nil
   config_param :unit, :string, :default => 'minute'
   config_param :aggregate, :string, :default => 'tag'
   config_param :tag, :string, :default => 'datacount'
@@ -13,19 +14,25 @@ class Fluent::DataCounterOutput < Fluent::Output
     config_param ('pattern' + i.to_s).to_sym, :string, :default => nil # NAME REGEXP
   end
 
+  attr_accessor :tick
   attr_accessor :counts
   attr_accessor :last_checked
 
   def configure(conf)
     super
 
-    @unit = case @unit
-            when 'minute' then :minute
-            when 'hour' then :hour
-            when 'day' then :day
-            else
-              raise Fluent::ConfigError, "flowcounter unit allows minute/hour/day"
-            end
+    if @count_interval
+      @tick = @count_interval.to_i
+    else
+      @tick = case @unit
+              when 'minute' then 60
+              when 'hour' then 3600
+              when 'day' then 86400
+              else 
+                raise RuntimeError, "@unit must be one of minute/hour/day"
+              end
+    end
+
     @aggregate = case @aggregate
                  when 'tag' then :tag
                  when 'all' then :all
@@ -144,16 +151,9 @@ class Fluent::DataCounterOutput < Fluent::Output
   def watch
     # instance variable, and public accessable, for test
     @last_checked = Fluent::Engine.now
-    tick = case @unit
-           when :minute then 60
-           when :hour then 3600
-           when :day then 86400
-           else 
-             raise RuntimeError, "@unit must be one of minute/hour/day"
-           end
     while true
       sleep 0.5
-      if Fluent::Engine.now - @last_checked >= tick
+      if Fluent::Engine.now - @last_checked >= @tick
         now = Fluent::Engine.now
         flush_emit(now - @last_checked)
         @last_checked = now

data/test/plugin/test_out_datacounter.rb

@@ -58,12 +58,45 @@ class DataCounterOutputTest < Test::Unit::TestCase
       count_key field
       pattern1 ok ^2\\d\\d$
     ]
-    assert_equal :minute, d.instance.unit
+    assert_equal 60, d.instance.tick
     assert_equal :tag, d.instance.aggregate
     assert_equal 'datacount', d.instance.tag
     assert_nil d.instance.input_tag_remove_prefix
     assert_equal 'field', d.instance.count_key
     assert_equal 'ok ^2\d\d$', d.instance.pattern1
+
+    d1 = create_driver %[
+      unit minute
+      count_key field
+      pattern1 ok ^2\\d\\d$
+    ]
+    d2 = create_driver %[
+      count_interval 60s
+      count_key field
+      pattern1 ok ^2\\d\\d$
+    ]
+    assert_equal d1.instance.tick, d2.instance.tick
+    
+    d = create_driver %[
+      count_interval 5m
+      count_key field
+      pattern1 ok ^2\\d\\d$
+    ]
+    assert_equal 300, d.instance.tick
+
+    d = create_driver %[
+      count_interval 2h
+      count_key field
+      pattern1 ok ^2\\d\\d$
+    ]
+    assert_equal 7200, d.instance.tick
+
+    d = create_driver %[
+      count_interval 30s
+      count_key field
+      pattern1 ok ^2\\d\\d$
+    ]
+    assert_equal 30, d.instance.tick
   end
 
   def test_count_initialized

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacounter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2161613960 !ruby/object:Gem::Requirement
+  requirement: &2160689900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161613960
+  version_requirements: *2160689900
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2161613520 !ruby/object:Gem::Requirement
+  requirement: &2160689460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161613520
+  version_requirements: *2160689460
 description: Output filter plugin to count messages that matches specified conditions
 email:
 - tagomoris@gmail.com