jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2025-12-16 18:26:16 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity

refactor decodeDockerLogStream

Browse Source
This commit is contained in:
henrygd
2025-12-02 18:22:22 -05:00
parent 8aac0a571a
commit fe550c5901
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
agent/docker.go
View File

@@ -708,7 +708,6 @@ func (dm *dockerManager) getLogs(ctx context.Context, containerID string) (strin
func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error { func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error {
const headerSize = 8 const headerSize = 8
var header [headerSize]byte var header [headerSize]byte
buf := make([]byte, 0, dockerLogsTail*200)
totalBytesRead := 0 totalBytesRead := 0
for { for {
@@ -732,36 +731,18 @@ func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error {
// Check if reading this frame would exceed total log size limit // Check if reading this frame would exceed total log size limit
if totalBytesRead+int(frameLen) > maxTotalLogSize { if totalBytesRead+int(frameLen) > maxTotalLogSize {
// Read and discard remaining data to avoid blocking // Read and discard remaining data to avoid blocking
_, _ = io.Copy(io.Discard, io.LimitReader(reader, int64(frameLen))) _, _ = io.CopyN(io.Discard, reader, int64(frameLen))
slog.Debug("Truncating logs: limit reached", "read", totalBytesRead, "limit", maxTotalLogSize) slog.Debug("Truncating logs: limit reached", "read", totalBytesRead, "limit", maxTotalLogSize)
return nil return nil
} }
buf = allocateBuffer(buf, int(frameLen)) n, err := io.CopyN(builder, reader, int64(frameLen))
if _, err := io.ReadFull(reader, buf[:frameLen]); err != nil { if err != nil {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) { if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
if len(buf) > 0 {
builder.Write(buf[:min(int(frameLen), len(buf))])
}
return nil return nil
} }
return err return err
} }
builder.Write(buf[:frameLen]) totalBytesRead += int(n)
totalBytesRead += int(frameLen)
} }
} }
func allocateBuffer(current []byte, needed int) []byte {
if cap(current) >= needed {
return current[:needed]
}
return make([]byte, needed)
}
func min(a, b int) int {
if a < b {
return a
}
return b
}