fluent-plugin-select 0.0.2 → 0.0.3

data/README.markdown

@@ -16,8 +16,9 @@ This sample config outputs access logs that have status code 200.
     </source>
     <match tag>
       type select
-      select_if record["code"] == "200"
+      select record["code"] == "200"
       add_prefix filtered
+      timeout 1s
     </match>
     <match filtered.tag>
       type file
@@ -26,3 +27,20 @@ This sample config outputs access logs that have status code 200.
 
 
 The parameter "select" can use 3 variables in event log; tag, time, record. The format of time is an integer number of seconds since the Epoch. The format of record is hash.
+
+
+tag is alternative for add\_prefix. The 2 following match directives are same:
+
+    <match tag>
+      type select
+      select record["code"] == "200"
+      add_prefix filtered
+      timeout 1s
+    </match>
+    <match tag>
+      type select
+      select record["code"] == "200"
+      tag filtered.tag
+      timeout 1s
+    </match>
+

data/fluent-plugin-select.gemspec

@@ -3,14 +3,14 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-select"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
   s.homepage    = "https://github.com/tomity/fluent-plugin-select"
   s.summary     = %q{fluent-plugin-select is the non-buffered plugin that can be filtered by ruby script. }
   s.description = %q{fluent-plugin-select is the non-buffered plugin that can be filtered by ruby script. }
 
-  s.rubyforge_project = "fluent-plugin-select-if"
+  s.rubyforge_project = "fluent-plugin-select"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/out_select.rb

@@ -4,30 +4,60 @@ module Fluent
     Fluent::Plugin.register_output('select', self)
 
     config_param :select, :string
-    config_param :add_prefix, :string
-    config_param :timeout, :integer, :default => 1
+    config_param :add_prefix, :string, :default => nil
+    config_param :tag, :string, :default => nil
+    config_param :timeout, :time, :default => 1
+
+    def configure(conf)
+      super
+      if @add_prefix
+        @mode = "add_prefix"
+      elsif @tag
+        @mode = "tag"
+      else
+        raise ConfigError, "Either add_prefix or tag is required "
+      end
+    end
 
     def emit(tag, es, chain)
       begin
-        time_records = []
-        es.each {|time, record|
-          if eval(@select)
-            $log.trace {"hoge"}
-            time_records << [time, record]
-          else
-            $log.trace {"filtered: #{Time.at(time)} #{tag} #{record.inspect}"}
-          end
-        }
-        time_records.each do |time, record|
-          Fluent::Engine::emit(@add_prefix + "." + tag, time, record)
+        output_es = do_select(tag, es)
+        if @mode == "add_prefix"
+          Fluent::Engine::emit_stream(@add_prefix + "." + tag, output_es)
+        else
+          Fluent::Engine::emit_stream(@tag, output_es)
         end
         chain.next
-        time_records #for test
+        output_es #for test
       rescue SyntaxError => e
         chain.next
         $log.error "Select command is syntax error: #{@select}"
         e #for test
       end
     end
+
+    def do_select(tag, es)
+      output_es = MultiEventStream.new
+      es.each {|time, record|
+        timeout_block{
+          if eval(@select)
+            output_es.add(time, record)
+          else
+            $log.trace {"filtered: #{Time.at(time)} #{tag} #{record.inspect}"}
+          end
+        }
+      }
+      output_es
+    end
+
+    def timeout_block
+      begin
+        Timeout.timeout(@timeout){
+          yield
+        }
+      rescue Timeout::Error
+        $log.error {"Timeout: #{Time.at(time)} #{tag} #{record.inspect}"}
+      end
+    end
   end
 end

data/test/plugin/test_out_select.rb

@@ -66,8 +66,8 @@ class SelectOutputTest < Test::Unit::TestCase
     d1.run do
       d1.emit(record, time)
     end
-    emits = d1.emits
-    assert_equal 0, emits.length
+    es = d1.emits
+    assert_equal 0, es.length
   end
 
   def test_syntax_error
@@ -86,4 +86,49 @@ class SelectOutputTest < Test::Unit::TestCase
     e =  d1.instance.emit(tag, es, chain)
     assert e.kind_of?(SyntaxError)
   end
+
+  def test_match_tag_using_tag_param
+    tag = 'tag' #match
+    time = Time.local(2012, 10, 10, 10, 10, 10) #not match
+    record = {'code' => '300'} #not match
+
+    d1 = create_driver %[
+    select tag == "tag" or record["code"] == "200" or Time.at(time).sec == 0
+    tag prefix.tag
+    ], tag
+    d1.run do
+      d1.emit(record, time)
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal ["prefix.#{tag}", time.to_i, record], emits[0]
+  end
+
+  def test_config_error
+    tag = 'tag' #match
+    time = Time.local(2012, 10, 10, 10, 10, 10) #not match
+    record = {'code' => '300'} #not match
+
+    assert_raise(Fluent::ConfigError){
+      create_driver %[
+        select tag == "tag" or record["code"] == "200" or Time.at(time).sec == 0
+      ], tag
+    }
+  end
+
+  def test_timeout
+    tag = 'tag' #match
+    time = Time.local(2012, 10, 10, 10, 10, 10) #not match
+    record = {'code' => '300'} #not match
+
+    d1 = create_driver  %[
+      select sleep 10
+      add_prefix prefix
+    ], tag
+    d1.run do
+      d1.emit(record, time)
+    end
+    emits = d1.emits
+    assert_equal 0, emits.length
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-select
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70228126073860 !ruby/object:Gem::Requirement
+  requirement: &70178059895040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70228126073860
+  version_requirements: *70178059895040
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70228126071880 !ruby/object:Gem::Requirement
+  requirement: &70178059894500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.10.24
   type: :development
   prerelease: false
-  version_requirements: *70228126071880
+  version_requirements: *70178059894500
 description: ! 'fluent-plugin-select is the non-buffered plugin that can be filtered
   by ruby script. '
 email:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fluent-plugin-select-if
+rubyforge_project: fluent-plugin-select
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3