fluent-plugin-concat 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bde56d6e8baa024582b8bbc7efd938216df7ac9f77516bc43911e8037243887
-  data.tar.gz: 1aecde24c36f133fc2568ae22e1258c90d38dc08feca441ee33681d1a89b507a
+  metadata.gz: 0a119cbc6b5774f81bde44b530ece7292c1f83635d6577155baad7d3c6d9544c
+  data.tar.gz: 92c703271e63894f9b56c8a4d3d22c68c79c2ee6e219adb9b934fbb05a7464cf
 SHA512:
-  metadata.gz: d265acfd6d96c026fa67ad044946523508599ff7d93304a5d435e9494dfd300ecfa2458d920b0ef1d6e2a4bdb710920dd463d4de77291ef3136f08328179e230
-  data.tar.gz: facc4c3213e2348842035e8876073b26be69bc8c8e3306038bc66ae3628af52658e0d369c4d8c3e4604fbc6bd0bcb40f87998e5796cb5777b49f15d603edb247
+  metadata.gz: cc59b890e0a82eca4a27663f2705f1ae4bf98e2d89c626696f90f523b73310df779cb26b92fdf544aa0e149f3c3e4b97569ea7291475b828ed2378082ec3a0bf
+  data.tar.gz: 6b7eca55c66e0a038faf738ff718952a57bbf382881ffc7c03663984ede6f8e34d3219b737f4922ec83e1e82d82d823d64ad4a943e96dc9d8581fac1c78a81ad

data/NEWS.md

@@ -1,5 +1,29 @@
 # ChangeLog
 
+## v2.2.3
+
+### Fixes
+
+* Fix a bug that `@timeout_map` will be updated while traversing it. See #49
+
+## v.2.2.2
+
+### Fixes
+
+* #48
+
+## v2.2.1
+
+### Fixes
+
+* #45
+
+## v2.2.0
+
+### Fixes
+
+* #43
+
 ## v2.0.0
 
 * Use Fluentd v0.14 API and drop Fluentd v0.12 or earlier support

data/fluent-plugin-concat.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "2.2.2"
+  spec.version       = "2.2.3"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 

data/lib/fluent/plugin/filter_concat.rb

@@ -34,7 +34,10 @@ module Fluent::Plugin
       super
 
       @buffer = Hash.new {|h, k| h[k] = [] }
-      @timeout_map = Hash.new {|h, k| h[k] = Fluent::Engine.now }
+      @timeout_map_mutex = Thread::Mutex.new
+      @timeout_map_mutex.synchronize do
+        @timeout_map = Hash.new {|h, k| h[k] = Fluent::Engine.now }
+      end
     end
 
     def configure(conf)
@@ -119,7 +122,9 @@ module Fluent::Plugin
       else
         stream_identity = "#{tag}:default"
       end
-      @timeout_map[stream_identity] = Fluent::Engine.now
+      @timeout_map_mutex.synchronize do
+        @timeout_map[stream_identity] = Fluent::Engine.now
+      end
       case @mode
       when :line
         process_line(stream_identity, tag, time, record)
@@ -220,18 +225,20 @@ module Fluent::Plugin
     def flush_timeout_buffer
       now = Fluent::Engine.now
       timeout_stream_identities = []
-      @timeout_map.each do |stream_identity, previous_timestamp|
-        next if @flush_interval > (now - previous_timestamp)
-        next if @buffer[stream_identity].empty?
-        time, flushed_record = flush_buffer(stream_identity)
-        timeout_stream_identities << stream_identity
-        tag = stream_identity.split(":").first
-        message = "Timeout flush: #{stream_identity}"
-        handle_timeout_error(tag, @use_first_timestamp ? time : now, flushed_record, message)
-        log.info(message)
-      end
-      @timeout_map.reject! do |stream_identity, _|
-        timeout_stream_identities.include?(stream_identity)
+      @timeout_map_mutex.synchronize do
+        @timeout_map.each do |stream_identity, previous_timestamp|
+          next if @flush_interval > (now - previous_timestamp)
+          next if @buffer[stream_identity].empty?
+          time, flushed_record = flush_buffer(stream_identity)
+          timeout_stream_identities << stream_identity
+          tag = stream_identity.split(":").first
+          message = "Timeout flush: #{stream_identity}"
+          handle_timeout_error(tag, @use_first_timestamp ? time : now, flushed_record, message)
+          log.info(message)
+        end
+        @timeout_map.reject! do |stream_identity, _|
+          timeout_stream_identities.include?(stream_identity)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages