Merge pull request sirupsen#346 from e-max/logstash_formatter_race

race in logstashformatter.go
jdrivas · Apr 16, 2016 · ed4b7af · ed4b7af
2 parents 7e6f976 + 8a870e4
commit ed4b7af
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/formatters/logstash/logstash.go b/formatters/logstash/logstash.go
@@ -24,11 +24,13 @@ func (f *LogstashFormatter) Format(entry *logrus.Entry) ([]byte, error) {
 
 	fields["@version"] = 1
 
-	if f.TimestampFormat == "" {
-		f.TimestampFormat = logrus.DefaultTimestampFormat
+	timeStampFormat := f.TimestampFormat
+
+	if timeStampFormat == "" {
+		timeStampFormat = logrus.DefaultTimestampFormat
 	}
 
-	fields["@timestamp"] = entry.Time.Format(f.TimestampFormat)
+	fields["@timestamp"] = entry.Time.Format(timeStampFormat)
 
 	// set message field
 	v, ok := entry.Data["message"]