Update write_to

* use **kwargs * not to call super
fluent · Aug 29, 2016 · 66f8c18 · 66f8c18
1 parent d97ecdd
commit 66f8c18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/lib/fluent/plugin/buffer/chunk.rb b/lib/fluent/plugin/buffer/chunk.rb
@@ -152,7 +152,7 @@ def open(&block)
           raise NotImplementedError, "Implement this method in child class"
         end
 
-        def write_to(io, options = {})
+        def write_to(io, **kwargs)
           open do |i|
             IO.copy_stream(i, io)
           end
@@ -161,17 +161,6 @@ def write_to(io, options = {})
         module Decompressable
           include Fluent::Plugin::Compressable
 
-          def write_to(io, options = {})
-            unless options[:compress] == :gzip
-              c = decompress(read)
-              if @chunk.is_a?(String)
-                @chunk = c
-              else
-                # reset io(@chunk) to overwrite new chunk
-                @chunk.seek(0, IO::SEEK_SET)
-                @chunk.truncate(0)
-                @chunk.write c
-              end
           def read(**kwargs)
             return super if kwargs[:compress] == :gzip
 
@@ -185,7 +174,8 @@ def read(**kwargs)
             end
           end
 
-            super
+          def write_to(io, **kwargs)
+            io.write(read(kwargs))
           end
         end
       end

diff --git a/lib/fluent/plugin/buffer/memory_chunk.rb b/lib/fluent/plugin/buffer/memory_chunk.rb
@@ -80,7 +80,7 @@ def open(&block)
           StringIO.open(@chunk, &block)
         end
 
-        def write_to(io, options = {})
+        def write_to(io, **kwargs)
           # re-implementation to optimize not to create StringIO
           io.write @chunk
         end