Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

in_tail: reduce the lifespan of the buffer area #4763

Merged
merged 1 commit into from
Jan 9, 2025
+2 −2
Merged

in_tail: reduce the lifespan of the buffer area #4763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/fluent/plugin/in_tail.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,6 @@ def initialize(watcher, path:, read_lines_limit:, 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)
@iobuf = ''.force_encoding('ASCII-8BIT')
@lines = []
@io = nil
@notify_mutex = Mutex.new
Expand Down Expand Up @@ -1201,6 +1200,7 @@ def handle_notify
end

with_io do |io|
iobuf = ''.force_encoding('ASCII-8BIT')
begin
read_more = false
has_skipped_line = false
Expand All @@ -1211,7 +1211,7 @@ def handle_notify
@start_reading_time ||= Fluent::Clock.now
group_watcher&.update_reading_time(@path)

data = io.readpartial(BYTES_TO_READ, @iobuf)
data = io.readpartial(BYTES_TO_READ, iobuf)
@eof = false
@number_bytes_read += data.bytesize
@fifo << data
Expand Down
Loading