Skip to content

Commit

Permalink
Merge pull request #304 from ygurumi/check-log-err-concat
Browse files Browse the repository at this point in the history
[check-log] Make building the error lines efficiently
  • Loading branch information
syou6162 committed Nov 7, 2019
2 parents 86ed8ec + d8e225d commit ab310e7
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions check-log/lib/check-log.go
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ func (opts *logOpts) searchReader(ctx context.Context, rdr io.Reader) (warnNum,
newReader = newBufferedReader
}

var errLinesBuilder strings.Builder
r := newReader(rdr)
for ctx.Err() == nil {
lineBytes, rErr := r.ReadBytes('\n')
Expand All @@ -377,7 +378,8 @@ func (opts *logOpts) searchReader(ctx context.Context, rdr io.Reader) (warnNum,
if err != nil {
warnNum++
critNum++
errLines += line + "\n"
errLinesBuilder.WriteString(line)
errLinesBuilder.WriteString("\n")
} else {
levelOver := false
if level > opts.WarnLevel {
Expand All @@ -389,16 +391,20 @@ func (opts *logOpts) searchReader(ctx context.Context, rdr io.Reader) (warnNum,
critNum++
}
if levelOver {
errLines += line + "\n"
errLinesBuilder.WriteString(line)
errLinesBuilder.WriteString("\n")
}
}
} else {
warnNum++
critNum++
errLines += line + "\n"
errLinesBuilder.WriteString(line)
errLinesBuilder.WriteString("\n")
}
}
}

errLines = errLinesBuilder.String()
return
}

Expand Down

0 comments on commit ab310e7

Please sign in to comment.