InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47983 from cpuguy83/skip_corrupted_log_files

Browse Source 
Make log reading more robust to errors
This commit is contained in:
Brian Goff
2024-09-03 08:58:08 -07:00
committed by GitHub
parent f9bac835b4 6d94122217
commit 55752bb1ec
18 changed files with 667 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/tailfile/tailfile.go
View File

@@ -48,7 +48,7 @@ type SizeReaderAt interface {
}
// NewTailReader scopes the passed in reader to just the last N lines passed in
func NewTailReader(ctx context.Context, r SizeReaderAt, reqLines int) (io.Reader, int, error) {
func NewTailReader(ctx context.Context, r SizeReaderAt, reqLines int) (*io.SectionReader, int, error) {
return NewTailReaderWithDelimiter(ctx, r, reqLines, eol)
}
@@ -56,7 +56,7 @@ func NewTailReader(ctx context.Context, r SizeReaderAt, reqLines int) (io.Reader
// In this case a "line" is defined by the passed in delimiter.
//
// Delimiter lengths should be generally small, no more than 12 bytes
func NewTailReaderWithDelimiter(ctx context.Context, r SizeReaderAt, reqLines int, delimiter []byte) (io.Reader, int, error) {
func NewTailReaderWithDelimiter(ctx context.Context, r SizeReaderAt, reqLines int, delimiter []byte) (*io.SectionReader, int, error) {
if reqLines < 1 {
return nil, 0, ErrNonPositiveLinesNumber
}
@@ -71,7 +71,7 @@ func NewTailReaderWithDelimiter(ctx context.Context, r SizeReaderAt, reqLines in
)
if int64(len(delimiter)) >= size {
return bytes.NewReader(nil), 0, nil
return io.NewSectionReader(bytes.NewReader(nil), 0, 0), 0, nil
}
scanner := newScanner(r, delimiter)
@@ -92,7 +92,7 @@ func NewTailReaderWithDelimiter(ctx context.Context, r SizeReaderAt, reqLines in
tailStart = scanner.Start(ctx)
if found == 0 {
return bytes.NewReader(nil), 0, nil
return io.NewSectionReader(bytes.NewReader(nil), 0, 0), 0, nil
}
if found < reqLines && tailStart != 0 {