mirror
/
logrus
mirror of https://github.com/sirupsen/logrus.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1047 from lwsanty/fix-race-conditions-on-entry 

fix race conditions on entry
This commit is contained in:
Mark Phelps 2020-02-26 18:44:58 -05:00 committed by GitHub
parent 7fab003954 c7278b2d7a
commit 77ab282a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry.go
View File

@ -122,6 +122,8 @@ func (entry *Entry) WithField(key string, value interface{}) *Entry {
// Add a map of fields to the Entry. // Add a map of fields to the Entry.
func (entry *Entry) WithFields(fields Fields) *Entry { func (entry *Entry) WithFields(fields Fields) *Entry {
entry.Logger.mu.Lock()
defer entry.Logger.mu.Unlock()
data := make(Fields, len(entry.Data)+len(fields)) data := make(Fields, len(entry.Data)+len(fields))
for k, v := range entry.Data { for k, v := range entry.Data {
data[k] = v data[k] = v

8
entry_test.go
View File

@ -210,7 +210,7 @@ func TestEntryWithIncorrectField(t *testing.T) {
fn := func() {} fn := func() {}
e := Entry{} e := &Entry{Logger: New()}
eWithFunc := e.WithFields(Fields{"func": fn}) eWithFunc := e.WithFields(Fields{"func": fn})
eWithFuncPtr := e.WithFields(Fields{"funcPtr": &fn}) eWithFuncPtr := e.WithFields(Fields{"funcPtr": &fn})
@ -238,8 +238,8 @@ func TestEntryLogfLevel(t *testing.T) {
entry := NewEntry(logger) entry := NewEntry(logger)
entry.Logf(DebugLevel, "%s", "debug") entry.Logf(DebugLevel, "%s", "debug")
assert.NotContains(t, buffer.String(), "debug", ) assert.NotContains(t, buffer.String(), "debug")
entry.Logf(WarnLevel, "%s", "warn") entry.Logf(WarnLevel, "%s", "warn")
assert.Contains(t, buffer.String(), "warn", ) assert.Contains(t, buffer.String(), "warn")
} }