Skip to content

Commit 2afe673

Browse files
committed
Fully reading buffer and downgrade log level
1 parent af4126f commit 2afe673

File tree

2 files changed

+7
-5
lines changed
  • pkg
    • accesslog/collector/protocols
    • profiling/task/network/analyze/layer7/protocols/http1/reader

2 files changed

+7
-5
lines changed

pkg/accesslog/collector/protocols/http1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (p *HTTP1Protocol) Analyze(connection *PartitionConnection, _ *AnalyzeHelpe
112112
result = enums.ParseResultSkipPackage
113113
}
114114
if err != nil {
115-
http1Log.Warnf("failed to handle HTTP/1.x protocol, connection ID: %d, random ID: %d, data id: %d, type: %d, error: %v",
115+
http1Log.Debugf("failed to handle HTTP/1.x protocol, connection ID: %d, random ID: %d, data id: %d, type: %d, error: %v",
116116
metrics.ConnectionID, metrics.RandomID, buf.Position().DataID(), messageType, err)
117117
}
118118

pkg/profiling/task/network/analyze/layer7/protocols/http1/reader/reader.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package reader
2020
import (
2121
"bufio"
2222
"compress/gzip"
23+
"errors"
2324
"fmt"
2425
"io"
2526
"mime"
@@ -275,15 +276,16 @@ func (m *MessageOpt) checkBodyWithSize(buf *buffer.Buffer, reader *bufio.Reader,
275276
if readSize > len(m.Reader().bodyBuffer) {
276277
readSize = len(m.Reader().bodyBuffer)
277278
}
278-
lastReadSize, err = reader.Read(m.Reader().bodyBuffer[0:readSize])
279+
lastReadSize, err = io.ReadFull(reader, m.Reader().bodyBuffer[0:readSize])
279280
if err != nil {
280-
if err == buffer.ErrNotComplete {
281+
if errors.Is(err, buffer.ErrNotComplete) {
281282
return nil, enums.ParseResultSkipPackage, nil
282283
}
283-
if err == io.EOF && reduceSize-lastReadSize <= 0 {
284+
if (err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF)) && reduceSize-lastReadSize <= 0 {
284285
return nil, enums.ParseResultSuccess, nil
285286
}
286-
return nil, enums.ParseResultSkipPackage, err
287+
288+
return nil, enums.ParseResultSkipPackage, fmt.Errorf("reading the body error: %v", err)
287289
}
288290
reduceSize -= lastReadSize
289291
}

0 commit comments

Comments
 (0)