Merge pull request #31 from aybabtme/fix-time-parsing

aybabtme · web-flow · commit f0655c5eec47 · 2019-12-18T10:32:24.000+09:00
parse time using supported time fields, not level fields...
diff --git a/json_handler.go b/json_handler.go
@@ -75,7 +75,7 @@ func (h *JSONHandler) UnmarshalJSON(data []byte) bool {
 		return false
 	}
 
-	checkEachUntilFound(supportedLevelFields, func(field string) bool {
+	checkEachUntilFound(supportedTimeFields, func(field string) bool {
 		time, ok := tryParseTime(raw[field])
 		if ok {
 			h.Time = time
diff --git a/logfmt_handler.go b/logfmt_handler.go
@@ -62,7 +62,7 @@ func (h *LogfmtHandler) UnmarshalLogfmt(data []byte) bool {
 			key := dec.Key()
 			val := dec.Value()
 			if h.Time.IsZero() {
-				foundTime := checkEachUntilFound(supportedLevelFields, func(field string) bool {
+				foundTime := checkEachUntilFound(supportedTimeFields, func(field string) bool {
 					time, ok := tryParseTime(string(val))
 					if ok {
 						h.Time = time

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func (h *JSONHandler) UnmarshalJSON(data []byte) bool {`
`75`	`75`	`return false`
`76`	`76`	`}`
`77`	`77`
`78`		`- checkEachUntilFound(supportedLevelFields, func(field string) bool {`
	`78`	`+ checkEachUntilFound(supportedTimeFields, func(field string) bool {`
`79`	`79`	`time, ok := tryParseTime(raw[field])`
`80`	`80`	`if ok {`
`81`	`81`	`h.Time = time`