From 978daa6eab525232eecd8f520c0f35b7e93aa798 Mon Sep 17 00:00:00 2001 From: Yoann La Cancellera Date: Fri, 20 Oct 2023 11:42:43 +0200 Subject: [PATCH] Add: shortuuid check, new date layout found --- src/go/pt-galera-log-explainer/regex/date.go | 1 + src/go/pt-galera-log-explainer/utils/utils.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/go/pt-galera-log-explainer/regex/date.go b/src/go/pt-galera-log-explainer/regex/date.go index 973d37a5..a022c563 100644 --- a/src/go/pt-galera-log-explainer/regex/date.go +++ b/src/go/pt-galera-log-explainer/regex/date.go @@ -17,6 +17,7 @@ import ( var DateLayouts = []string{ "2006-01-02T15:04:05.000000Z", // 5.7 "2006-01-02T15:04:05.000000-07:00", // 5.7 + "2006-01-02T15:04:05Z", // found in some crashes "060102 15:04:05", // 5.5 "2006-01-02 15:04:05", // 5.6 "2006-01-02 15:04:05", // 10.3, yes the extra space is needed diff --git a/src/go/pt-galera-log-explainer/utils/utils.go b/src/go/pt-galera-log-explainer/utils/utils.go index f4c25d61..db739184 100644 --- a/src/go/pt-galera-log-explainer/utils/utils.go +++ b/src/go/pt-galera-log-explainer/utils/utils.go @@ -110,6 +110,9 @@ func StringsReplaceReversed(s, old, new string, n int) string { func UUIDToShortUUID(uuid string) string { splitted := strings.Split(uuid, "-") + if len(splitted) != 5 { + return uuid + } return splitted[0] + "-" + splitted[3] }