Skip to content
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

Jump to bottom

Resolve race condition with SetReportCaller() and Entry #1116

Merged
merged 4 commits into from Mar 22, 2020
Merged

Resolve race condition with SetReportCaller() and Entry #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e76a5c4
create test to prove issue sirupsen/logrus#954
admacleod Mar 19, 2020
b28acda
fix race condition in entry
admacleod Mar 19, 2020
ba670ba
fix deadlock in previous entry race condition fix
admacleod Mar 19, 2020
e3e4060
remove errant whitespace
admacleod Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions entry.go
View file
Open in desktop
Expand Up @@ -232,9 +232,11 @@ func (entry Entry) log(level Level, msg string) {

entry.Level = level
entry.Message = msg
entry.Logger.mu.Lock()
if entry.Logger.ReportCaller {
entry.Caller = getCaller()
}
entry.Logger.mu.Unlock()

entry.fireHooks()

Expand Down
11 changes: 11 additions & 0 deletions entry_test.go
View file
Open in desktop
Expand Up @@ -243,3 +243,14 @@ func TestEntryLogfLevel(t *testing.T) {
entry.Logf(WarnLevel, "%s", "warn")
assert.Contains(t, buffer.String(), "warn")
}

func TestEntryReportCallerRace(t *testing.T) {
logger := New()
entry := NewEntry(logger)
go func() {
logger.SetReportCaller(true)
}()
go func() {
entry.Info("should not race")
}()
}