From 3d789641a384b4356a5a9e7c65ca94eda68915b3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 13 May 2020 17:51:56 +0200 Subject: pkg/report: add Report.SkipPos SkipPos is what pkg/instance needs, but also will be needed for ParseAll. --- pkg/instance/instance.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkg/instance') diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index d88838576..39de02017 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -6,7 +6,6 @@ package instance import ( - "bytes" "encoding/json" "fmt" "net" @@ -245,11 +244,7 @@ func (inst *inst) test() error { rep := inst.reporter.Parse(testErr.Output) if rep != nil && rep.Type == report.UnexpectedReboot { // Avoid detecting any boot crash as "unexpected kernel reboot". - output := testErr.Output[rep.EndPos:] - if pos := bytes.IndexByte(testErr.Output[rep.StartPos:], '\n'); pos != -1 { - output = testErr.Output[rep.StartPos+pos:] - } - rep = inst.reporter.Parse(output) + rep = inst.reporter.Parse(testErr.Output[rep.SkipPos:]) } if rep == nil { rep = &report.Report{ -- cgit mrf-deployment