Limit stdout tracelog to actual stdout (#16258)

Related #16243

Signed-off-by: Andrew Thornton <art27@cantab.net>
release/v1.15
zeripath 2021-06-26 13:47:56 +01:00 committed by GitHub
parent e3c626834b
commit 19ac575d57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -199,7 +199,11 @@ func (c *Command) RunInDirTimeoutEnv(env []string, timeout time.Duration, dir st
return nil, ConcatenateError(err, stderr.String()) return nil, ConcatenateError(err, stderr.String())
} }
if stdout.Len() > 0 && log.IsTrace() { if stdout.Len() > 0 && log.IsTrace() {
log.Trace("Stdout:\n %s", stdout.Bytes()[:1024]) tracelen := stdout.Len()
if tracelen > 1024 {
tracelen = 1024
}
log.Trace("Stdout:\n %s", stdout.Bytes()[:tracelen])
} }
return stdout.Bytes(), nil return stdout.Bytes(), nil
} }