Skip to content

Fix backend data race #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix backend data race #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

package logging

import (
"sync/atomic"
)

// defaultBackend is the backend used for all logging calls.
var defaultBackend LeveledBackend
var defaultBackend atomic.Value

// Backend is the interface which a log backend need to implement to be able to
// be used as a logging backend.
Expand All @@ -23,17 +27,19 @@ func SetBackend(backends ...Backend) LeveledBackend {
backend = MultiLogger(backends...)
}

defaultBackend = AddModuleLevel(backend)
return defaultBackend
newDefaultBackend := AddModuleLevel(backend)
defaultBackend.Store(&newDefaultBackend)

return *defaultBackend.Load().(*LeveledBackend)
}

// SetLevel sets the logging level for the specified module. The module
// corresponds to the string specified in GetLogger.
func SetLevel(level Level, module string) {
defaultBackend.SetLevel(level, module)
(*defaultBackend.Load().(*LeveledBackend)).SetLevel(level, module)
}

// GetLevel returns the logging level for the specified module.
func GetLevel(module string) Level {
return defaultBackend.GetLevel(module)
return (*defaultBackend.Load().(*LeveledBackend)).GetLevel(module)
}
4 changes: 2 additions & 2 deletions logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func Reset() {

// IsEnabledFor returns true if the logger is enabled for the given level.
func (l *Logger) IsEnabledFor(level Level) bool {
return defaultBackend.IsEnabledFor(level, l.Module)
return (*defaultBackend.Load().(*LeveledBackend)).IsEnabledFor(level, l.Module)
}

func (l *Logger) log(lvl Level, format *string, args ...interface{}) {
Expand Down Expand Up @@ -167,7 +167,7 @@ func (l *Logger) log(lvl Level, format *string, args ...interface{}) {
return
}

defaultBackend.Log(lvl, 2+l.ExtraCalldepth, record)
(*defaultBackend.Load().(*LeveledBackend)).Log(lvl, 2+l.ExtraCalldepth, record)
}

// Fatal is equivalent to l.Critical(fmt.Sprint()) followed by a call to os.Exit(1).
Expand Down