fluent-plugin-concat 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4aa01995d47f27e2c79b6e117872d72995e061
-  data.tar.gz: f846be7e55d2bd0029bc2b369fc0a546be8fca6e
+  metadata.gz: 6e0e8f69b86fd07cc91f4045b25ac65cb7355130
+  data.tar.gz: 3927ef6dd92afbe5807ce1dbf34c77a190e723b4
 SHA512:
-  metadata.gz: da41f352fb2d1201c3ae2bc97593590abe11823dcb7c3b561f5d48126510f0c676d772f524ce44fd76d3075082968e7a6793bb2dc94714a83994a717c7466c0f
-  data.tar.gz: 5cf5f9dc762eb74068836f83031dae8a29bbe923e023507830cacaab702cf0fd04a5033a9d97d9664d54b0de7b79cfc29595e701a19a0cc0f03595fab84f2d97
+  metadata.gz: 3f2e2eeaa5321ab37aaa86cc2974e1239121e84dd9c8fd4a80aa809ac0f9483307cacb50ff003b6ab749c21fc56ff6d00c0913367fd4294b2ff82f493609c4ee
+  data.tar.gz: c27abd17cef7c40df3cd09d63e8ca61a5d2d87a6d465cd5f4df50e5246b9c933a593a987fba967ecf51132098f5857fc8128bc7e026a03b96496d5fbb7463acb

data/README.md

@@ -49,6 +49,10 @@ The regexp to match ending of multiline.
 
 The key to determine which stream an event belongs to.
 
+**flush\_interval**
+
+The number of seconds after which the last received event log will be flushed.
+
 ## Usage
 
 Every 10 events will be concatenated into one event.

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       = "0.4.1"
+  spec.version       = "0.5.0"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 

data/lib/fluent/plugin/filter_concat.rb

@@ -16,6 +16,8 @@ module Fluent
     config_param :stream_identity_key, :string, default: nil
     desc "The interval between data flushes"
     config_param :flush_interval, :time, default: 60
+    desc "The label name to handle timeout"
+    config_param :timeout_label, :string, default: nil
 
     class TimeoutError < StandardError
     end
@@ -134,12 +136,13 @@ module Fluent
 
     def flush_buffer(stream_identity, new_element = nil)
       lines = @buffer[stream_identity].map {|_tag, _time, record| record[@key] }
+      _tag, _time, last_record = @buffer[stream_identity].last
       new_record = {
         @key => lines.join(@separator)
       }
       @buffer[stream_identity] = []
       @buffer[stream_identity] << new_element if new_element
-      new_record
+      last_record.merge(new_record)
     end
 
     def flush_timeout_buffer
@@ -151,8 +154,8 @@ module Fluent
         timeout_stream_identities << stream_identity
         tag = stream_identity.split(":").first
         message = "Timeout flush: #{stream_identity}"
-        router.emit_error_event(tag, now, flushed_record, TimeoutError.new(message))
-        log.info message
+        handle_timeout_error(tag, now, flushed_record, message)
+        log.info(message)
       end
       @timeout_map.reject! do |stream_identity, _|
         timeout_stream_identities.include?(stream_identity)
@@ -169,11 +172,21 @@ module Fluent
         }
         tag, time, record = elements.last
         message = "Flush remaining buffer: #{stream_identity}"
-        router.emit_error_event(tag, time, record.merge(new_record), TimeoutError.new(message))
+        handle_timeout_error(tag, time, record.merge(new_record), message)
+        log.info(message)
       end
       @buffer.clear
     end
 
+    def handle_timeout_error(tag, time, record, message)
+      if @timeout_label
+        label = Engine.root_agent.find_label(@timeout_label)
+        label.event_router.emit(tag, time, record)
+      else
+        router.emit_error_event(tag, time, record, TimeoutError.new(message))
+      end
+    end
+
     class TimeoutTimer < Coolio::TimerWatcher
       def initialize(interval, callback)
         super(interval, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages