MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not log client canceled events (#17838)

Browse Source
This commit is contained in:
Harshavardhana 2023-08-17 14:53:43 -07:00 committed by GitHub
parent dde1a12819
commit 11dfc817f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/logger/target/http/http.go
View File

@ -377,7 +377,11 @@ func (h *Target) Send(ctx context.Context, entry interface{}) error {
select {
case h.logCh <- entry:
case <-ctx.Done():
return ctx.Err()
// return error only for context timedout.
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
return ctx.Err()
}
return nil
default:
nWorkers := atomic.LoadInt64(&h.workers)
if nWorkers < maxWorkers {

6
internal/logger/target/kafka/kafka.go
View File

@ -330,6 +330,12 @@ func (h *Target) Send(ctx context.Context, entry interface{}) error {
select {
case h.logCh <- entry:
case <-ctx.Done():
// return error only for context timedout.
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
return ctx.Err()
}
return nil
default:
// log channel is full, do not wait and return
// an error immediately to the caller