fluent-plugin-concat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27d3958d3254219e7ca4fe4e063ba5d9fcccadd9
-  data.tar.gz: bf836cffc244561d46bd47837aa3ce0018c36c93
+  metadata.gz: 513922bd28dc2cf029d6e5ef790c71a332abfa3b
+  data.tar.gz: d75f93313cb86329e5baf204f1fec4e3e0ae18ad
 SHA512:
-  metadata.gz: 44fa6336681c18243a889ac5e0124f91d41654c8df7f4c8af65d9796bc5498805431035b841e2013a430131f7e4e63188e5caa10ea71b7150ff4fbeb357fb77b
-  data.tar.gz: 298996442014f001cd197a051231278d59f5877402c1993e627e88840e25d0af158dda3da2294b3405d78ed9d3d7d36037cc74c61b6c8fa493c784c0f4e0f598
+  metadata.gz: 25563c71811242e4c34fa3f80e76dec201351d53506cc06091d4a5a2634829e48d1340eace8a6f2674fe9c82656ac8b595eb4214b83dd93c55a28be17b9fc3ad
+  data.tar.gz: bd3403a21a0902b985efdb2dede5bc5aa9cc2c3757dc68cd31ebdb311484570c18d315306c879e7b3dd47d5313ff763a0b9bcb514a5b225195c1df2914f077e4

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

data/lib/fluent/plugin/filter_concat.rb

@@ -10,11 +10,13 @@ module Fluent
     config_param :n_lines, :integer, default: nil
     desc "The regexp to match beginning of multiline"
     config_param :multiline_start_regexp, :string, default: nil
+    desc "The key to determine which stream an event belongs to"
+    config_param :stream_identity_key, :string, default: nil
 
     def initialize
       super
 
-      @buffer = []
+      @buffer = Hash.new{|h, k| h[k] = [] }
     end
 
     def configure(conf)
@@ -53,21 +55,26 @@ module Fluent
     private
 
     def process(record)
+      if @stream_identity_key
+        stream_identity = record[@stream_identity_key]
+      else
+        stream_identity = "default"
+      end
       case @mode
       when :line
-        @buffer << record[@key]
-        if @n_lines && @buffer.size >= @n_lines
-          return flush_buffer
+        @buffer[stream_identity] << record[@key]
+        if @n_lines && @buffer[stream_identity].size >= @n_lines
+          return flush_buffer(stream_identity)
         end
       when :regexp
         if firstline?(record[@key])
-          if @buffer.empty?
-            @buffer << record[@key]
+          if @buffer[stream_identity].empty?
+            @buffer[stream_identity] << record[@key]
           else
-            return flush_buffer(record[@key])
+            return flush_buffer(stream_identity, record[@key])
           end
         else
-          @buffer << record[@key]
+          @buffer[stream_identity] << record[@key]
         end
       end
       nil
@@ -77,11 +84,11 @@ module Fluent
       !!@multiline_start_regexp.match(text)
     end
 
-    def flush_buffer(new_message = nil)
+    def flush_buffer(stream_identity, new_message = nil)
       new_record = {}
-      new_record[@key] = @buffer.join(@separator)
-      @buffer = []
-      @buffer << new_message if new_message
+      new_record[@key] = @buffer[stream_identity].join(@separator)
+      @buffer[stream_identity] = []
+      @buffer[stream_identity] << new_message if new_message
       new_record
     end
   end

metadata

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