Skip to content

Commit f13b289

Browse files
committed
Fix invalid message polluting subsequent message
Signed-off-by: Satoshi Matsumoto <[email protected]>
1 parent fd471f9 commit f13b289

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

lib/fluent/logger/fluent_logger.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,9 @@ def to_msgpack(msg)
231231
@packer.pack(msg).to_s
232232
rescue NoMethodError
233233
JSON.parse(JSON.generate(msg)).to_msgpack
234+
ensure
235+
@packer.clear
234236
end
235-
@packer.clear
236237
res
237238
}
238239
end

spec/fluent_logger_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
expect(fluentd.queue.last).to be_nil
206206
logger_io.rewind
207207
logger_io.read =~ /FluentLogger: Can't convert to msgpack:/
208+
209+
logger.post('tag', { 'a' => 'b' })
210+
fluentd.wait_transfer
211+
expect(fluentd.queue.last).to eq ['logger-test.tag', { 'a' => 'b' }]
208212
}
209213

210214
it ('should raise an error when second argument is non hash object') {

0 commit comments

Comments
 (0)