re
/
logrus
forked from mirror/logrus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1116 from admacleod/master 

Resolve race condition with SetReportCaller() and Entry
This commit is contained in:
Mark Phelps 2020-03-22 09:24:01 -04:00 committed by GitHub
parent 7ea96a3284 e3e40605a2
commit 4ddc9cf62e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry.go
View File

@ -232,9 +232,11 @@ func (entry Entry) log(level Level, msg string) {
entry.Level = level entry.Level = level
entry.Message = msg entry.Message = msg
entry.Logger.mu.Lock()
if entry.Logger.ReportCaller { if entry.Logger.ReportCaller {
entry.Caller = getCaller() entry.Caller = getCaller()
} }
entry.Logger.mu.Unlock()
entry.fireHooks() entry.fireHooks()

11
entry_test.go
View File

@ -243,3 +243,14 @@ func TestEntryLogfLevel(t *testing.T) {
entry.Logf(WarnLevel, "%s", "warn") entry.Logf(WarnLevel, "%s", "warn")
assert.Contains(t, buffer.String(), "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")
}()
}