From c5dba4360acff23a89f301235401ddfe19ab99a8 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Tue, 15 Oct 2024 18:17:46 +0300 Subject: fix: channel reader blocks until EOF or an error was received --- pkg/util/io.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkg/util/io.go') diff --git a/pkg/util/io.go b/pkg/util/io.go index 5c56822..8c8725b 100644 --- a/pkg/util/io.go +++ b/pkg/util/io.go @@ -5,6 +5,8 @@ import ( "io" ) +const bufferSize = 512 + type ChannelReader struct { Out <-chan []byte Err <-chan error @@ -17,6 +19,7 @@ func NewChannelReader(ctx context.Context, reader io.Reader) ChannelReader { go func(in chan<- []byte, inErr chan<- error) { defer close(in) defer close(inErr) + data := make([]byte, bufferSize) outer: for { select { @@ -24,12 +27,12 @@ func NewChannelReader(ctx context.Context, reader io.Reader) ChannelReader { inErr <- ctx.Err() break outer default: - data, err := io.ReadAll(reader) - if err != nil { + n, err := reader.Read(data) + if err != nil && err != io.EOF { inErr <- err break outer } - in <- data + in <- data[:n] } } }(outCh, errCh) -- cgit v1.3.1