fluent-plugin-map 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5752e71c748288a604cb0b7bb1dfafcb4acaa207
-  data.tar.gz: 68f1c40b74c120c7aa598350f149a34bcc783ec9
+SHA256:
+  metadata.gz: be56f82414c48bf27501fb4baf54ae7c9ab530362d9262586382dd53c4799f9e
+  data.tar.gz: 98eb8b9d70e65c567a0cd4f65768b9dd286b5dff7396a317fdc60bc1775113cd
 SHA512:
-  metadata.gz: eb77d2a16a98e1a84c9a32535218be2be9074055ea91795b6b65b6fc9480ce91c188218a622a66c9bb6f7474b344517c16434cb140181f53f46f08ba4a896e2a
-  data.tar.gz: 2fbcf475ce14c75faa8fc9364969484bc371f9c41ad403b6709b9362c4be74ced3cb70a4b834e856b52f5636f0251d661ee17737560c1911d76823bcfc916d55
+  metadata.gz: aa4f2733d31394ceddb2e563261455ef156e74644a2c9f2af70fe8f91ef95f07b412f41829b683f07212bb4195a6488c0dd25cd260413ee6a01d6b99dc41c761
+  data.tar.gz: d1872e4817788d33fad7883465dd1af3e39f0de75f7c48dc82854eb7edc5484bf6f9e3335489bba00aa74c1b75260276800b3ad1c5cd03a5297dcefa61b1dc09

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+#### Problem
+
+...
+
+#### Steps to replicate
+
+Provide example config and message
+
+#### Expected Behavior
+
+...
+
+#### Your environment
+
+* OS version
+* paste result of ``fluentd --version`` or ``td-agent --version``
+* plugin version
+  * paste boot log of fluentd or td-agent
+  * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock

data/.travis.yml

@@ -5,8 +5,8 @@ before_install:
 rvm:
   - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.3
+  - 2.4.3
+  - 2.5.0
 gemfile:
-  - gemfiles/fluentd_0_14.gemfile
   - Gemfile

data/README.markdown

@@ -124,7 +124,7 @@ If you don't use multi option, you can use key, time, record parameter. The 2 fo
 ## Note
 
 you have to wrap some configuration values with parenthesis like `("code." + tag)`, to avoid parsing by Fluentd itself.
-See also: [Fluentd | Configuration File | Format tips](http://docs.fluentd.org/articles/config-file#format-tips)
+See also: [Config File Syntax - Fluentd](https://docs.fluentd.org/configuration/config-file#format-tips)
 
 ## Copyright
 

data/fluent-plugin-map.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.2.1"
+  s.version     = "0.3.0"
   s.authors     = ["Kohei Tomita", "Hiroshi Hatake", "Kenji Okomoto"]
   s.email       = ["tommy.fmale@gmail.com", "cosmo0920.oucc@gmail.com", "okkez000@gmail.com"]
   s.homepage    = "https://github.com/fluent-plugins-nursery/fluent-plugin-map"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.license       = "Apache-2.0"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "fluentd", [">= 0.14.0", "< 2"]
+  s.add_development_dependency "fluentd", [">= 1.7.0", "< 2"]
   s.add_development_dependency "test-unit", "~> 3.1"
   s.add_development_dependency "appraisal"
 end

data/lib/fluent/plugin/filter_map.rb

@@ -34,6 +34,12 @@ module Fluent::Plugin
       @map_support = Fluent::Plugin::MapSupport.new(@map, self)
     end
 
+    def stop
+      @map_support.stop
+
+      super
+    end
+
     def determine_format()
       if @format
         @format

data/lib/fluent/plugin/map_support.rb

@@ -14,12 +14,17 @@
 #    limitations under the License.
 #
 
+require 'fluent/plugin/parser'
+
 module Fluent
   module Plugin
     class MapSupport
       def initialize(map, plugin)
         @map = map
         @plugin = plugin
+        @checker = Fluent::Plugin::Parser::TimeoutChecker.new(@plugin.timeout)
+        @checker.start
+
         if plugin.is_a?(Fluent::Plugin::Filter)
           singleton_class.module_eval(<<-CODE)
           def map_func(time, record)
@@ -103,13 +108,17 @@ module Fluent
 
       def timeout_block
         begin
-          Timeout.timeout(@plugin.timeout){
+          @checker.execute {
             yield
           }
         rescue Timeout::Error
           @plugin.log.error {"Timeout: #{Time.at(time)} #{tag} #{record.inspect}"}
         end
       end
+
+      def stop
+        @checker.stop
+      end
     end
   end
 end

data/lib/fluent/plugin/out_map.rb

@@ -44,6 +44,12 @@ module Fluent::Plugin
       @map_support = Fluent::Plugin::MapSupport.new(@map, self)
     end
 
+    def stop
+      @map_support.stop
+
+      super
+    end
+
     def determine_format()
       if @format
         @format

data/test/plugin/test_filter_map.rb

@@ -18,9 +18,9 @@ class MapFilterTest < Test::Unit::TestCase
   end
 
   def test_syntax_error
-    tag = "tag"
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _tag = "tag"
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     #map is syntax error
     syntax_error_config = %[
@@ -65,8 +65,8 @@ class MapFilterTest < Test::Unit::TestCase
 
   #deprected specification test
   def test_config_error_time
-    tag = "tag"
-    record = {'code' => '300'}
+    _tag = "tag"
+    _record = {'code' => '300'}
 
     #require time
     assert_raise(Fluent::ConfigError){
@@ -77,7 +77,7 @@ class MapFilterTest < Test::Unit::TestCase
   end
 
   def test_config_error_record
-    time = event_time('2012-10-10 10:10:10')
+    _time = event_time('2012-10-10 10:10:10')
 
     #require record
     assert_raise(Fluent::ConfigError){
@@ -88,8 +88,8 @@ class MapFilterTest < Test::Unit::TestCase
   end
 
   def test_config_error_multi
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     #require time
     assert_raise(Fluent::ConfigError){
@@ -102,8 +102,8 @@ class MapFilterTest < Test::Unit::TestCase
   end
 
   def test_config_error_sleep
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     assert_raise(SyntaxError) {
       create_driver %[

data/test/plugin/test_out_map.rb

@@ -50,9 +50,9 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_syntax_error
-    tag = "tag"
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _tag = "tag"
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     #map is syntax error
     syntax_error_config = %[
@@ -116,9 +116,9 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_config_error_tag
-    tag = "tag"
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _tag = "tag"
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     #require time
     assert_raise(Fluent::ConfigError){
@@ -130,8 +130,8 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_config_error_time
-    tag = "tag"
-    record = {'code' => '300'}
+    _tag = "tag"
+    _record = {'code' => '300'}
 
     #require time
     assert_raise(Fluent::ConfigError){
@@ -143,8 +143,8 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_config_error_record
-    tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
+    _tag = "tag"
+    _time = Time.local(2012, 10, 10, 10, 10, 0).to_i
 
     #require record
     assert_raise(Fluent::ConfigError){
@@ -156,9 +156,9 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_config_error_multi
-    tag = "tag"
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _tag = "tag"
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     #require time
     assert_raise(Fluent::ConfigError){
@@ -172,9 +172,9 @@ class MapOutputTest < Test::Unit::TestCase
   end
 
   def test_config_error_sleep
-    tag = 'tag'
-    time = event_time('2012-10-10 10:10:10')
-    record = {'code' => '300'}
+    _tag = 'tag'
+    _time = event_time('2012-10-10 10:10:10')
+    _record = {'code' => '300'}
 
     assert_raise(SyntaxError) {
       create_driver %[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kohei Tomita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,7 +32,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -84,6 +84,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -92,7 +93,6 @@ files:
 - README.markdown
 - Rakefile
 - fluent-plugin-map.gemspec
-- gemfiles/fluentd_0_14.gemfile
 - lib/fluent/plugin/filter_map.rb
 - lib/fluent/plugin/map_config_param.rb
 - lib/fluent/plugin/map_support.rb
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fluent-plugin-map
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: fluent-plugin-map is the non-buffered plugin that can convert an event log

data/gemfiles/fluentd_0_14.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "fluentd", "~>0.14.0"
-
-gemspec :path => "../"