extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-05 01:17:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix double close in logger

Browse Source
This commit is contained in:
Viktor Liu 2025-01-02 18:59:53 +01:00
parent 568d064089
commit e912f2d7c0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/firewall/uspfilter/log/log.go
View File

@ -44,11 +44,12 @@ var levelStrings = map[Level]string{
// Logger is a high-performance, non-blocking logger // Logger is a high-performance, non-blocking logger
type Logger struct { type Logger struct {
output io.Writer output io.Writer
level atomic.Uint32 level atomic.Uint32
buffer *ringBuffer buffer *ringBuffer
shutdown chan struct{} shutdown chan struct{}
wg sync.WaitGroup closeOnce sync.Once
wg sync.WaitGroup
// Reusable buffer pool for formatting messages // Reusable buffer pool for formatting messages
bufPool sync.Pool bufPool sync.Pool
@ -170,9 +171,12 @@ func (l *Logger) worker() {
// Stop gracefully shuts down the logger // Stop gracefully shuts down the logger
func (l *Logger) Stop(ctx context.Context) error { func (l *Logger) Stop(ctx context.Context) error {
close(l.shutdown)
done := make(chan struct{}) done := make(chan struct{})
l.closeOnce.Do(func() {
close(l.shutdown)
})
go func() { go func() {
l.wg.Wait() l.wg.Wait()
close(done) close(done)