MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-21 17:43:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

audit/kafka: Fix quitting early after first logging (#14932)

Browse Source 
A recent commit created some regressions:
- Kafka/Audit goroutines quit when the first log is sent
- Missing doneCh initialization in Kafka audit
This commit is contained in:
Anis Elleuch 2022-05-17 15:43:25 +01:00 committed by GitHub
parent 040ac5cad8
commit e952e2a691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,11 +179,13 @@ func (h *Target) startHTTPLogger() {
go func() { go func() {
defer h.wg.Done() defer h.wg.Done()
select { for {
case entry := <-h.logCh: select {
h.logEntry(entry) case entry := <-h.logCh:
case <-h.doneCh: h.logEntry(entry)
return case <-h.doneCh:
return
}
} }
}() }()
} }

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

@ -96,11 +96,13 @@ func (h *Target) startKakfaLogger() {
go func() { go func() {
defer h.wg.Done() defer h.wg.Done()
select { for {
case entry := <-h.logCh: select {
h.logEntry(entry) case entry := <-h.logCh:
case <-h.doneCh: h.logEntry(entry)
return case <-h.doneCh:
return
}
} }
}() }()
} }
@ -230,6 +232,7 @@ func (h *Target) Cancel() {
func New(config Config) *Target { func New(config Config) *Target {
target := &Target{ target := &Target{
logCh: make(chan interface{}, 10000), logCh: make(chan interface{}, 10000),
doneCh: make(chan struct{}),
kconfig: config, kconfig: config,
} }
return target return target