Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/fluent/msgpack_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ def self.init(enable_time_support: false)
end

def self.thread_local_msgpack_packer
Thread.current[:local_msgpack_packer] ||= MessagePackFactory.engine_factory.packer
packer = Thread.current[:local_msgpack_packer] ||= MessagePackFactory.engine_factory.packer
# Discard bytes left by a write that raised.
# Use #clear because #reset needs msgpack 1.4.5 or later.
packer.clear
packer
end

def self.thread_local_msgpack_unpacker
Expand Down
10 changes: 10 additions & 0 deletions test/test_msgpack_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ class MessagePackFactoryTest < Test::Unit::TestCase
packer2 = Fluent::MessagePackFactory.thread_local_msgpack_packer
assert_equal packer1, packer2
end

test 'clear the internal buffer of packer every time' do
packer1 = Fluent::MessagePackFactory.thread_local_msgpack_packer
assert_raise(RangeError) do
packer1.write([1, {"big" => 2**64}])
end

packer2 = Fluent::MessagePackFactory.thread_local_msgpack_packer
assert_equal [1, {"user" => "other"}], MessagePack.unpack(packer2.write([1, {"user" => "other"}]).full_pack)
end
end

sub_test_case 'thread_local_msgpack_unpacker' do
Expand Down
Loading