From 570db1b0b9f51afe7da19539a75fd2c5232edf46 Mon Sep 17 00:00:00 2001 From: Peng Zhai Date: Thu, 16 Jul 2015 21:02:46 -0400 Subject: [PATCH] Fix data race issue in TextFormatter. Fix for https://github.com/Sirupsen/logrus/issues/217. --- text_formatter.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/text_formatter.go b/text_formatter.go index e25f86c..5f9ab46 100644 --- a/text_formatter.go +++ b/text_formatter.go @@ -73,14 +73,15 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) { isColorTerminal := isTerminal && (runtime.GOOS != "windows") isColored := (f.ForceColors || isColorTerminal) && !f.DisableColors - if f.TimestampFormat == "" { - f.TimestampFormat = DefaultTimestampFormat + timestampFormat := f.TimestampFormat + if timestampFormat == "" { + timestampFormat = DefaultTimestampFormat } if isColored { f.printColored(b, entry, keys) } else { if !f.DisableTimestamp { - f.appendKeyValue(b, "time", entry.Time.Format(f.TimestampFormat)) + f.appendKeyValue(b, "time", entry.Time.Format(timestampFormat)) } f.appendKeyValue(b, "level", entry.Level.String()) f.appendKeyValue(b, "msg", entry.Message)