From ba2a174e6dc54d35a1e4a9b9dcae66cb434d3db6 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Fri, 5 Feb 2016 19:12:21 -0800 Subject: [PATCH] capnslog: fix small race on PackageLogger.level --- capnslog/pkg_logger.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/capnslog/pkg_logger.go b/capnslog/pkg_logger.go index 32d2f16..a075167 100644 --- a/capnslog/pkg_logger.go +++ b/capnslog/pkg_logger.go @@ -27,17 +27,19 @@ type PackageLogger struct { const calldepth = 2 func (p *PackageLogger) internalLog(depth int, inLevel LogLevel, entries ...interface{}) { + logger.Lock() + defer logger.Unlock() if inLevel != CRITICAL && p.level < inLevel { return } - logger.Lock() - defer logger.Unlock() if logger.formatter != nil { logger.formatter.Format(p.pkg, inLevel, depth+1, entries...) } } func (p *PackageLogger) LevelAt(l LogLevel) bool { + logger.Lock() + defer logger.Unlock() return p.level >= l }