Merge pull request #98 from kaorimatz/fix-message-pollution

Fix invalid message polluting subsequent message
fluent · Dec 14, 2023 · cb7f00e · cb7f00e
2 parents fd471f9 + f13b289
commit cb7f00e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/fluent/logger/fluent_logger.rb b/lib/fluent/logger/fluent_logger.rb
@@ -231,8 +231,9 @@ def to_msgpack(msg)
                   @packer.pack(msg).to_s
                 rescue NoMethodError
                   JSON.parse(JSON.generate(msg)).to_msgpack
+                ensure
+                  @packer.clear
                 end
-          @packer.clear
           res
         }
       end

diff --git a/spec/fluent_logger_spec.rb b/spec/fluent_logger_spec.rb
@@ -205,6 +205,10 @@
         expect(fluentd.queue.last).to be_nil
         logger_io.rewind
         logger_io.read =~ /FluentLogger: Can't convert to msgpack:/
+
+        logger.post('tag', { 'a' => 'b' })
+        fluentd.wait_transfer
+        expect(fluentd.queue.last).to eq ['logger-test.tag', { 'a' => 'b' }]
       }
 
       it ('should raise an error when second argument is non hash object') {