Skip to content

Commit a7fe58b

Browse files
committed
Fix race in log
A race has been detected in #1441 relating to getting log levels. This PR protects the GetLevel and GetStacktraceLevel calls with a mutex. Signed-off-by: Andrew Thornton <art27@cantab.net>
1 parent 29d4917 commit a7fe58b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

modules/log/event.go

+4
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,15 @@ func (m *MultiChannelledLog) Flush() {
359359

360360
// GetLevel gets the level of this MultiChannelledLog
361361
func (m *MultiChannelledLog) GetLevel() Level {
362+
m.mutex.Lock()
363+
defer m.mutex.Unlock()
362364
return m.level
363365
}
364366

365367
// GetStacktraceLevel gets the level of this MultiChannelledLog
366368
func (m *MultiChannelledLog) GetStacktraceLevel() Level {
369+
m.mutex.Lock()
370+
defer m.mutex.Unlock()
367371
return m.stacktraceLevel
368372
}
369373

0 commit comments

Comments
 (0)