fluent-plugin-unit-time-filter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb21bb8de5296e1949d37a65ae7edb5e7ac6cccb
-  data.tar.gz: 1ac61305e86d61a953d9c56756d9731f596f4cbc
+  metadata.gz: 180c6e4465e1da97a1646bf9d82b9df431d363cf
+  data.tar.gz: 74a04b0c568bef90caff5691948abee16ed147cd
 SHA512:
-  metadata.gz: e1eab0e7c3d5f0c351a73ef7756dcef08837c38c8e8d5edd5127324e6ca0733e541b3343966bcd77ec2c352bd2c4b5955384f6c893c8bb1b5a7ff24a3504bd37
-  data.tar.gz: f89b7f1b131bdb410ec6908864b448fd6b9ea0d8c4d4e14c67d06d2cabf1bc97f8ccfff21ca767dde0a87a6f2837902f13e2d3f89516d43efa61fd56b0ace073
+  metadata.gz: b512af5d84a5593ec90d250e3eb1d4e89a8937a9b909f59bd71e831419c2e2c0454bd32924016a28e6afbf7cb9e986d48576968423ab3e8f3a183802dd8e17da
+  data.tar.gz: 6de88e2b63dade6980d063724ad88de35e4700b70d773709febde8fc32db77d5d5df34ea3997e8867bf54974d22d779520f1569faa8bb15643d43e1224933271

data/fluent-plugin-unit-time-filter.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-unit-time-filter"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Genki Sugawara"]
   spec.email         = ["sgwr_dts@yahoo.co.jp"]
   spec.description   = %q{Plug-in to aggregate by unit time}

data/lib/fluent/plugin/out_unit_time_filter.rb

@@ -21,7 +21,7 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
     end
 
     begin
-      @filter = Object.new.instance_eval(File.read(@filter_path))
+      @filter = Object.new.instance_eval(File.read(@filter_path), @filter_path)
     rescue => e
       raise Fluent::ConfigError, "Invalid filter: #{@filter_path}: #{e}"
     end
@@ -36,7 +36,7 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
     Thread.current[BUFFER_KEY] = nil
   end
 
-  def buffer
+  def use_buffer
     buf = Thread.current[BUFFER_KEY]
 
     unless buf
@@ -53,11 +53,19 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
       Thread.current[BUFFER_KEY] = buf
     end
 
-    return buf
+    begin
+      yield(buf)
+    rescue Exception => e
+      Thread.current[BUFFER_KEY] = nil
+      raise e
+    end
   end
 
   def emit(tag, es, chain)
-    buffer.resume(tag, es)
+    use_buffer do |buffer|
+      buffer.resume(tag, es)
+    end
+
     chain.next
   end
 end

data/lib/fluent/plugin/unit_time_filter_buffer.rb

@@ -33,7 +33,6 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
       unit_sec      = options[:unit_sec]
       prefix        = options[:prefix]
       emit_each_tag = options[:emit_each_tag]
-      pass_hash_row = options[:pass_hash_row]
 
       prev_time = nil
 

data/spec/out_unit_time_filter_spec.rb

@@ -233,4 +233,26 @@ describe Fluent::UnitTimeFilterOutput do
       end
     end
   end
+
+  describe 'when an error happened' do
+    it 'filter name should be to be included in the error' do
+      filter = <<-EOS
+        proc {|rs|
+          raise 'Any error message'
+        }
+      EOS
+
+      run_driver(:filter => filter, :tempfile => 'any_filter.rb') do |d|
+        begin
+          (0...10).each do |i|
+            d.emit({"key#{i}" => "val#{i}"}, time + i)
+            d.emit({"key#{i}_" => "val#{i}_"}, time + i)
+          end
+        rescue => e
+          expect(e.message).to eq('Any error message')
+          expect(File.basename(e.backtrace.first)).to be =~ /\Aany_filter\.rb/
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,14 +3,19 @@ require 'fluent/plugin/out_unit_time_filter'
 require 'tempfile'
 require 'time'
 
+# Disable Test::Unit
+module Test::Unit::RunCount; def run(*); end; end
+
 RSpec.configure do |config|
   config.before(:all) do
     Fluent::Test.setup
   end
 end
 
-def tempfile(content)
-  Tempfile.open("#{File.basename __FILE__}.#{$$}") do |f|
+def tempfile(content, basename = nil)
+  basename ||= "#{File.basename __FILE__}.#{$$}"
+
+  Tempfile.open(basename) do |f|
     f << content
     f.flush
     f.rewind
@@ -47,7 +52,7 @@ proc {|rs|
 
   tag = options[:tag] || 'test.default'
 
-  tempfile(filter) do |f|
+  tempfile(filter, options[:tempfile]) do |f|
     fluentd_conf = <<-EOS
 type unit_time_filter
 filter_path #{f.path}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-unit-time-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara