Merge branch 'master' of github.com:go-gitea/gitea into indexbyfileext

guillep2k · guillep2k · commit d63a0fb1350c · 2019-08-07T16:31:41.000-03:00
diff --git a/routers/repo/http.go b/routers/repo/http.go
@@ -427,7 +427,7 @@ func serviceRPC(h serviceHandler, service string) {
 	cmd.Stdin = reqBody
 	cmd.Stderr = &stderr
 	if err := cmd.Run(); err != nil {
-		log.Error("Fail to serve RPC(%s): %v - %v", service, err, stderr)
+		log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String())
 		return
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ func serviceRPC(h serviceHandler, service string) {`
`427`	`427`	`cmd.Stdin = reqBody`
`428`	`428`	`cmd.Stderr = &stderr`
`429`	`429`	`if err := cmd.Run(); err != nil {`
`430`		`- log.Error("Fail to serve RPC(%s): %v - %v", service, err, stderr)`
	`430`	`+ log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String())`
`431`	`431`	`return`
`432`	`432`	`}`
`433`	`433`	`}`