encoding

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>

Author: Watson1978

lib/fluent/plugin/in_tail.rb

@@ -1034,9 +1034,10 @@ class FIFO
         def initialize(from_encoding, encoding, log, max_line_size=nil)
           @from_encoding = from_encoding
           @encoding = encoding
-          @need_enc = from_encoding != encoding
-          @buffer = ''.force_encoding(from_encoding)
-          @eol = "\n".encode(from_encoding).freeze
+          @append_encoding = from_encoding || encoding
+          @need_enc = encoding && from_encoding && (from_encoding != encoding)
+          @buffer = ''.force_encoding(@append_encoding || Encoding::ASCII_8BIT)
+          @eol = "\n".encode(@append_encoding || Encoding::ASCII_8BIT).freeze
           @max_line_size = max_line_size
           @skip_current_line = false
           @skipping_current_line_bytesize = 0
@@ -1056,11 +1057,13 @@ def <<(chunk)
           # Feeding a string that has its encoding attribute set to any double-byte or
           # quad-byte encoding to IO#readpartial as the second arguments results in an
           # assertion failure on Ruby < 2.4.0 for unknown reasons.
-          orig_encoding = chunk.encoding
-          chunk.force_encoding(from_encoding)
+          if @append_encoding
+            orig_encoding = chunk.encoding
+            chunk.force_encoding(@append_encoding)
+          end
           @buffer << chunk
           # Thus the encoding needs to be reverted back here
-          chunk.force_encoding(orig_encoding)
+          chunk.force_encoding(orig_encoding) if @append_encoding
         end
 
         def convert(s)
@@ -1143,7 +1146,7 @@ def initialize(watcher, path:, read_lines_limit:, read_bytes_limit_per_second:,
           @read_bytes_limit_per_second = read_bytes_limit_per_second
           @receive_lines = receive_lines
           @open_on_every_update = open_on_every_update
-          @fifo = FIFO.new(from_encoding || Encoding::ASCII_8BIT, encoding || Encoding::ASCII_8BIT, log, max_line_size)
+          @fifo = FIFO.new(from_encoding, encoding, log, max_line_size)
           @lines = []
           @io = nil
           @notify_mutex = Mutex.new