fluent-plugin-rewrite 0.0.5 → 0.0.6

data/fluent-plugin-rewrite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rewrite"
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
   gem.authors       = ["Kentaro Kuribayashi"]
   gem.email         = ["kentarok@gmail.com"]
   gem.homepage      = "http://github.com/kentaro/fluent-plugin-rewrite"

data/lib/fluent/plugin/out_rewrite.rb

@@ -41,23 +41,8 @@ module Fluent
     end
 
     def emit(tag, es, chain)
-      es.each do |time, record|
-        tag, record = rewrite(tag, record)
-        Engine.emit(tag, time, record) if tag && record
-      end
-
-      chain.next
-    end
-
-    def length_will_be_removed
-      return 0 unless @remove_prefix
-      (@remove_prefix + '.').length
-    end
-
-    def rewrite(tag, record)
       if @remove_prefix and
-          ((tag.start_with?(@removed_prefix_string) && tag.length > @removed_length) ||
-          tag == @remove_prefix)
+        ((tag.start_with?(@removed_prefix_string) && tag.length > @removed_length) || tag == @remove_prefix)
         tag = tag[@removed_length..-1] || ''
       end
 
@@ -65,6 +50,15 @@ module Fluent
         tag = tag && tag.length > 0 ? @added_prefix_string + tag : @add_prefix
       end
 
+      es.each do |time, record|
+        filtered_tag, record = rewrite(tag, record)
+        Engine.emit(filtered_tag, time, record) if (filtered_tag && record) && (filtered_tag != tag)
+      end
+
+      chain.next
+    end
+
+    def rewrite(tag, record)
       rules.each do |rule|
         tag, record, last = apply_rule(rule, tag, record)
 
@@ -76,10 +70,10 @@ module Fluent
     end
 
     def apply_rule(rule, tag, record)
-      tag     = rule["append_to_tag"] ? tag.dup : tag
-      key     = rule["key"]
-      pattern = rule["pattern"]
-      last    = nil
+      tag_prefix = tag && tag.length > 0 ? "." : ""
+      key        = rule["key"]
+      pattern    = rule["pattern"]
+      last       = nil
 
       return [tag, record] if !key || !record.has_key?(key)
       return [tag, record] unless pattern
@@ -94,9 +88,11 @@ module Fluent
 
         if rule["append_to_tag"]
           if rule["tag"]
-            tag << (tag == "" ? "" : ".") << "#{rule["tag"]}"
+            tag += (tag_prefix + rule["tag"])
           else
-            matched.captures.each { |m| tag << (tag == "" ? "" : ".") << "#{m}" }
+            matched.captures.each do |m|
+              tag += (tag_prefix + "#{m}")
+            end
           end
         end
 
@@ -105,7 +101,7 @@ module Fluent
         end
       else
         if rule["append_to_tag"] && rule["fallback"]
-          tag << ".#{rule["fallback"]}"
+          tag += (tag_prefix + rule["fallback"])
         end
       end
 

data/test/plugin/test_out_rewrite.rb

@@ -160,8 +160,6 @@ class RewriteOutputTest < Test::Unit::TestCase
     )
 
     d4 = create_driver(%[
-      remove_prefix test
-
       <rule>
         key           path
         pattern       ^\/(users|entries)
@@ -170,13 +168,11 @@ class RewriteOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal(
-      [ "users", { "path" => "/users/antipop" } ],
+      [ "test.users", { "path" => "/users/antipop" } ],
       d4.instance.rewrite("test", { "path" => "/users/antipop" })
     )
 
     d5 = create_driver(%[
-      remove_prefix test
-
       <rule>
         key           is_logged_in
         pattern       1
@@ -186,7 +182,7 @@ class RewriteOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal(
-      [ "user", { "is_logged_in" => "1" } ],
+      [ "test.user", { "is_logged_in" => "1" } ],
       d5.instance.rewrite("test", { "is_logged_in" => "1" })
     )
   end
@@ -250,24 +246,6 @@ class RewriteOutputTest < Test::Unit::TestCase
     )
   end
 
-  def test_tag_prefix
-    d = create_driver(%[
-      remove_prefix test
-      add_prefix    filtered
-
-      <rule>
-        key           path
-        pattern       ^\/(users|entries)
-        append_to_tag true
-      </rule>
-    ])
-
-    assert_equal(
-      [ "filtered.users", { "path" => "/users/antipop" } ],
-      d.instance.rewrite("test", { "path" => "/users/antipop" })
-    )
-  end
-
   def test_emit
     d = create_driver(%[
       remove_prefix test
@@ -293,15 +271,21 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     d.run do
       d.emit({ "path" => "/foo?bar=1" })
-      d.emit({ "path" => "/users/antipop?hoge=1" })
       d.emit({ "path" => "/foo?bar=1", "status" => "500" })
+      d.emit({ "path" => "/users/antipop" })
+      d.emit({ "path" => "/users/kentaro" })
+      d.emit({ "path" => "/entries/1" })
     end
     emits = d.emits
 
-    assert_equal 2, emits.size
+    assert_equal 4, emits.size
     assert_equal('filtered.others', emits[0][0])
     assert_equal({ "path" => "/foo" }, emits[0][2])
     assert_equal('filtered.users', emits[1][0])
     assert_equal({ "path" => "/users/antipop" }, emits[1][2])
+    assert_equal('filtered.users', emits[2][0])
+    assert_equal({ "path" => "/users/kentaro" }, emits[2][2])
+    assert_equal('filtered.entries', emits[3][0])
+    assert_equal({ "path" => "/entries/1" }, emits[3][2])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake