Merge remote-tracking branch 'giteaofficial/main'

zjjhot · zjjhot · commit 5d1aa17f7d28 · 2022-02-22T20:40:57.000+08:00
* giteaofficial/main: Don't report signal: killed errors in serviceRPC (go-gitea#18850)
diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go
@@ -495,7 +495,9 @@ func serviceRPC(ctx gocontext.Context, h serviceHandler, service string) {
 		Stdin:   reqBody,
 		Stderr:  &stderr,
 	}); err != nil {
-		log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())
+		if err.Error() != "signal: killed" {
+			log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())
+		}
 		return
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,9 @@ func serviceRPC(ctx gocontext.Context, h serviceHandler, service string) {`
`495`	`495`	`Stdin: reqBody,`
`496`	`496`	`Stderr: &stderr,`
`497`	`497`	`}); err != nil {`
`498`		`- log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())`
	`498`	`+ if err.Error() != "signal: killed" {`
	`499`	`+ log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())`
	`500`	`+ }`
`499`	`501`	`return`
`500`	`502`	`}`
`501`	`503`	`}`