fluent-plugin-grepcounter 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e1b135258e27a199ad76aff3b150c6d898ca4e
-  data.tar.gz: ce4a20861ad649906f1439f94b0f55f13c6b4bb8
+  metadata.gz: f187009dead1522e4bef22b7a505085d271ee46c
+  data.tar.gz: ff997a2771fa6e16a5fa6f44758d0a46d59cbeeb
 SHA512:
-  metadata.gz: f3a5ace25e1e8a5a68e94e6862849671ce291b93c5c85ca13ee35a9f6c3504de1d71e1c39c400956c77e0d2304f9d1192b8669b274ff32d58a3c531d574fc1e2
-  data.tar.gz: 7dee91e123f491709e8e9fabe339f357cddb8192ac50a2c2150823f7ff1f46748e9f810d21f815735d2257fe39782662e624b86b4ede37dfa2fba28c9fff0789
+  metadata.gz: 2fa074c1989f4117b55a5e656d7e1290e8e60dfe9ce55c97c007da627bea24bf4690256413c6bac5d688a9c585b1d9b3f65a421b568a6ccd1b8784460cf9d944
+  data.tar.gz: 12d5df257832eb73754849bc9b0acc95a0834cc05b4ab32ed0f996ad6732525daf2971dbbb4074734c987b8e3b9340ff0691dba9d0cb34c6a69316b432954296

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.6 (2015/05/10)
+
+Enhancements:
+
+* Support label feature of Fluentd v0.12
+
 ## 0.5.5 (2014/08/06)
 
 Enhancements:

data/fluent-plugin-grepcounter.gemspec

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

data/lib/fluent/plugin/out_grepcounter.rb

@@ -7,6 +7,11 @@ class Fluent::GrepCounterOutput < Fluent::Output
     define_method("log") { $log }
   end
 
+  # Define `router` method of v0.12 to support v0.10 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   REGEXP_MAX_NUM = 20
 
   def initialize
@@ -95,7 +100,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
       end
     end
 
-    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil? and @remove_tag_slice.nil?
+    if conf['@label'].nil? and @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil? and @remove_tag_slice.nil?
       @add_tag_prefix = 'count' # not ConfigError to support lower version compatibility
     end
     @tag_proc = tag_proc
@@ -203,14 +208,14 @@ class Fluent::GrepCounterOutput < Fluent::Output
       count = flushed_counts[:all]
       matches = flushed_matches[:all]
       output = generate_output(count, matches)
-      Fluent::Engine.emit(@tag, time, output) if output
+      router.emit(@tag, time, output) if output
     when 'out_tag'
       flushed_counts.keys.each do |out_tag|
         count = flushed_counts[out_tag]
         matches = flushed_matches[out_tag]
         output = generate_output(count, matches)
         if output
-          Fluent::Engine.emit(out_tag, time, output)
+          router.emit(out_tag, time, output)
         end
       end
     else # in_tag
@@ -220,7 +225,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
         output = generate_output(count, matches, tag)
         if output
           out_tag = @tag_proc.call(tag)
-          Fluent::Engine.emit(out_tag, time, output)
+          router.emit(out_tag, time, output)
         end
       end
     end

data/spec/out_grepcounter_spec.rb

@@ -94,7 +94,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -103,7 +103,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[ regexp WARN ] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>3,
           "message"=>[
             "2013/01/13T07:02:13.232645 WARN POST /auth",
@@ -119,7 +119,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { %[ regexp1 message WARN ] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>3,
         }).delete!('message'))
       end
@@ -130,7 +130,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[regexp WARN \n exclude favicon] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>2,
           "message"=>[
             "2013/01/13T07:02:13.232645 WARN POST /auth",
@@ -145,7 +145,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { %[regexp1 message WARN \n exclude1 message favicon] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge({
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>2,
         }).delete!('message'))
       end
@@ -157,7 +157,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[threshold 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -166,7 +166,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[threshold 5] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -175,7 +175,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[threshold 4 \n comparator <=] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -184,7 +184,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[threshold 3 \n comparator <=] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -195,7 +195,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_equal 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -204,7 +204,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_equal 5] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -213,7 +213,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_than 3] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -222,7 +222,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_than 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -231,7 +231,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[less_equal 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -240,7 +240,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[less_equal 3] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -249,7 +249,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[less_than 5] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -258,7 +258,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[less_than 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -267,7 +267,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_than 1 \n less_than 5] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected)
+          expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected)
         end
         it { emit }
       end
@@ -276,7 +276,7 @@ describe Fluent::GrepCounterOutput do
         let(:config) { CONFIG + %[greater_than 1 \n less_than 4] }
         before do
           allow(Fluent::Engine).to receive(:now).and_return(time)
-          expect(Fluent::Engine).not_to receive(:emit)
+          expect(driver.instance.router).not_to receive(:emit)
         end
         it { emit }
       end
@@ -286,7 +286,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[output_tag foo] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("foo", time, expected)
       end
       it { emit }
     end
@@ -295,7 +295,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[tag foo] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("foo", time, expected)
       end
       it { emit }
     end
@@ -305,7 +305,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo.#{tag}", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("foo.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -315,7 +315,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("host1", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("host1", time, expected)
       end
       it { emit }
     end
@@ -325,7 +325,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("#{tag}.foo", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("#{tag}.foo", time, expected)
       end
       it { emit }
     end
@@ -335,7 +335,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("syslog", time, expected)
       end
       it { emit }
     end
@@ -345,7 +345,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("syslog", time, expected)
       end
       it { emit }
     end
@@ -360,7 +360,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.foo.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo.foo.foo", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("foo.foo.foo", time, expected)
       end
       it { emit }
     end
@@ -370,7 +370,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo.#{tag}", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("foo.#{tag}", time, expected)
       end
       it { emit }
     end
@@ -380,7 +380,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("host1", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("host1", time, expected)
       end
       it { emit }
     end
@@ -390,7 +390,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("#{tag}.foo", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("#{tag}.foo", time, expected)
       end
       it { emit }
     end
@@ -400,7 +400,7 @@ describe Fluent::GrepCounterOutput do
       let(:tag) { 'syslog.host1' }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("syslog", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("syslog", time, expected)
       end
       it { emit }
     end
@@ -411,7 +411,7 @@ describe Fluent::GrepCounterOutput do
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
         message = expected["message"].join('\n')
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
       end
       it { emit }
     end
@@ -422,7 +422,7 @@ describe Fluent::GrepCounterOutput do
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
         message = expected["message"].join('\n')
-        expect(Fluent::Engine).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
+        expect(driver.instance.router).to receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
       end
       it { emit }
     end
@@ -444,7 +444,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[aggregate all \n output_tag count] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("count", time, expected)
+        expect(driver.instance.router).to receive(:emit).with("count", time, expected)
       end
       it { emit }
     end
@@ -460,10 +460,10 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[aggregate tag \n remove_tag_slice 0..-2] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "count"=>2, "message"=>["foobar", "foobar"], "input_tag"=>"foo.bar", "input_tag_last"=>"bar"
         })
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "count"=>2, "message"=>["foobar", "foobar"], "input_tag"=>"foo.bar2", "input_tag_last"=>"bar2"
         })
       end
@@ -481,7 +481,7 @@ describe Fluent::GrepCounterOutput do
       let(:config) { CONFIG + %[aggregate out_tag \n remove_tag_slice 0..-2] }
       before do
         allow(Fluent::Engine).to receive(:now).and_return(time)
-        expect(Fluent::Engine).to receive(:emit).with("foo", time, {
+        expect(driver.instance.router).to receive(:emit).with("foo", time, {
           "count"=>4, "message"=>["foobar", "foobar", "foobar", "foobar"]
         })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd