Have prefixFieldClashes respect the JSON FieldMap

Currently, it will fix clashes that don't exist and miss clashes that do exist due to field remapping. Fixes #708
2018-02-13 17:44:51 -08:00
parent 8c0189d9f6
commit efab7f37b7
4 changed files with 68 additions and 9 deletions
@@ -58,7 +58,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 			data[k] = v
 		}
 	}
-	prefixFieldClashes(data)
+	prefixFieldClashes(data, f.FieldMap)

 	timestampFormat := f.TimestampFormat
 	if timestampFormat == "" {