diff --git a/src/go/pt-galera-log-explainer/ctx.go b/src/go/pt-galera-log-explainer/ctx.go index 9c988fc8..b47c3f7e 100644 --- a/src/go/pt-galera-log-explainer/ctx.go +++ b/src/go/pt-galera-log-explainer/ctx.go @@ -23,15 +23,20 @@ func (c *ctx) Run() error { return err } - fmt.Println(translate.DBToJson()) + out := struct { + DB any + Contexts []any + }{} + out.DB = translate.GetDB() for _, t := range timeline { - out, err := json.MarshalIndent(t[len(t)-1].Ctx, "", "\t") - if err != nil { - return err - } - fmt.Println(string(out)) + out.Contexts = append(out.Contexts, t[len(t)-1].Ctx) } + outjson, err := json.MarshalIndent(out, "", "\t") + if err != nil { + return err + } + fmt.Println(string(outjson)) return nil } diff --git a/src/go/pt-galera-log-explainer/internal.go b/src/go/pt-galera-log-explainer/internal.go index bcfc829b..35549c42 100644 --- a/src/go/pt-galera-log-explainer/internal.go +++ b/src/go/pt-galera-log-explainer/internal.go @@ -192,14 +192,12 @@ func iterateOnGrepResults(path string, regexes types.RegexMap, grepStdout <-chan // If it's recentEnough, it means we already validated a log: every next logs necessarily happened later // this is useful because not every logs have a date attached, and some without date are very useful - //if !recentEnough && CLI.Since != nil && (!foundDate || (foundDate && CLI.Since.After(date.Time))) { if CLI.Since != nil && CLI.Since.After(timestamp) { continue } if CLI.Until != nil && CLI.Until.Before(timestamp) { return lt } - // recentEnough = true filetype := regex.FileType(line, CLI.PxcOperator) ctx.FileType = filetype diff --git a/src/go/pt-galera-log-explainer/regex/date.go b/src/go/pt-galera-log-explainer/regex/date.go index a022c563..1d7f8fed 100644 --- a/src/go/pt-galera-log-explainer/regex/date.go +++ b/src/go/pt-galera-log-explainer/regex/date.go @@ -93,11 +93,6 @@ func NoDatesRegex(skipLeadingCircumflex bool) string { return "^(?![0-9]{4})" } -/* -SYSLOG_DATE="\(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\) \( \|[0-9]\)[0-9] [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}" -REGEX_LOG_PREFIX="$REGEX_DATE \?[0-9]* " -*/ - const k8sprefix = `{"log":"` func SearchDateFromLog(logline string) (time.Time, string, bool) { diff --git a/src/go/pt-galera-log-explainer/regex/states.go b/src/go/pt-galera-log-explainer/regex/states.go index a062fdb1..a77ab483 100644 --- a/src/go/pt-galera-log-explainer/regex/states.go +++ b/src/go/pt-galera-log-explainer/regex/states.go @@ -19,10 +19,7 @@ var ( ctx.SetState(newState) if newState == "DONOR" || newState == "JOINER" { - shiftTimestamp, _, ok := SearchDateFromLog(log) - if ok { - ctx.ConfirmSSTMetadata(shiftTimestamp) - } + ctx.ConfirmSSTMetadata(date) } log = utils.PaintForState(submatches["state1"], submatches["state1"]) + " -> " + utils.PaintForState(submatches["state2"], submatches["state2"])