From 6bf080393d88534aa658ecaff32ae089bd304772 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 4 Apr 2017 11:42:07 -0700 Subject: Fixing race conditions in the code base (#5966) * Adding initial race detector * Remove setting of config twice * Fixing config file watch and config reload on license save * Fixing config file watch and config reload on license save * Fixing build error * Fixing locking issue * Fixing makefile * Fixing race in config * Fixing race in status unit test * Adding EE race tests * Fixing race in cluster info * Removing code that's isn't needed * Fixing some more races * Fixing govet issue --- utils/config.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index cecc7a361..2e41f8431 100644 --- a/utils/config.go +++ b/utils/config.go @@ -72,6 +72,8 @@ func FindDir(dir string) string { } func DisableDebugLogForTest() { + cfgMutex.Lock() + defer cfgMutex.Unlock() if l4g.Global["stdout"] != nil { originalDisableDebugLvl = l4g.Global["stdout"].Level l4g.Global["stdout"].Level = l4g.ERROR @@ -79,6 +81,8 @@ func DisableDebugLogForTest() { } func EnableDebugLogForTest() { + cfgMutex.Lock() + defer cfgMutex.Unlock() if l4g.Global["stdout"] != nil { l4g.Global["stdout"].Level = originalDisableDebugLvl } -- cgit v1.2.3-1-g7c22