Limit stdout tracelog to actual stdout (#16258)

zeripath · web-flow · commit 19ac575d572a · 2021-06-26T13:47:56.000+01:00
Related #16243 Signed-off-by: Andrew Thornton <art27@cantab.net>
diff --git a/modules/git/command.go b/modules/git/command.go
@@ -199,7 +199,11 @@ func (c *Command) RunInDirTimeoutEnv(env []string, timeout time.Duration, dir st
 		return nil, ConcatenateError(err, stderr.String())
 	}
 	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
 }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,11 @@ func (c *Command) RunInDirTimeoutEnv(env []string, timeout time.Duration, dir st`
`199`	`199`	`return nil, ConcatenateError(err, stderr.String())`
`200`	`200`	`}`
`201`	`201`	`if stdout.Len() > 0 && log.IsTrace() {`
`202`		`- log.Trace("Stdout:\n %s", stdout.Bytes()[:1024])`
	`202`	`+ tracelen := stdout.Len()`
	`203`	`+ if tracelen > 1024 {`
	`204`	`+ tracelen = 1024`
	`205`	`+ }`
	`206`	`+ log.Trace("Stdout:\n %s", stdout.Bytes()[:tracelen])`
`203`	`207`	`}`
`204`	`208`	`return stdout.Bytes(), nil`
`205`	`209`	`}`