summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/alecthomas/log4go/pattlog.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-04-04 11:42:07 -0700
committerHarrison Healey <harrisonmhealey@gmail.com>2017-04-04 14:42:07 -0400
commit6bf080393d88534aa658ecaff32ae089bd304772 (patch)
treebe25ba4cea3d687d11fe49537b84fae4bf21a484 /vendor/github.com/alecthomas/log4go/pattlog.go
parent32460bf63bc07c69ee5da0bb5640b879facb5538 (diff)
downloadchat-6bf080393d88534aa658ecaff32ae089bd304772.tar.gz
chat-6bf080393d88534aa658ecaff32ae089bd304772.tar.bz2
chat-6bf080393d88534aa658ecaff32ae089bd304772.zip
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
Diffstat (limited to 'vendor/github.com/alecthomas/log4go/pattlog.go')
-rw-r--r--vendor/github.com/alecthomas/log4go/pattlog.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/vendor/github.com/alecthomas/log4go/pattlog.go b/vendor/github.com/alecthomas/log4go/pattlog.go
index 82b4e36b1..98632e4da 100644
--- a/vendor/github.com/alecthomas/log4go/pattlog.go
+++ b/vendor/github.com/alecthomas/log4go/pattlog.go
@@ -7,6 +7,7 @@ import (
"fmt"
"io"
"strings"
+ "sync"
)
const (
@@ -22,6 +23,7 @@ type formatCacheType struct {
}
var formatCache = &formatCacheType{}
+var mutex sync.Mutex
// Known format codes:
// %T - Time (15:04:05 MST)
@@ -44,6 +46,7 @@ func FormatLogRecord(format string, rec *LogRecord) string {
out := bytes.NewBuffer(make([]byte, 0, 64))
secs := rec.Created.UnixNano() / 1e9
+ mutex.Lock()
cache := *formatCache
if cache.LastUpdateSeconds != secs {
month, day, year := rec.Created.Month(), rec.Created.Day(), rec.Created.Year()
@@ -59,6 +62,7 @@ func FormatLogRecord(format string, rec *LogRecord) string {
cache = *updated
formatCache = updated
}
+ mutex.Unlock()
// Split the string into pieces by % signs
pieces := bytes.Split([]byte(format), []byte{'%'})