openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Do not write build_error proto file if there are no build errors."

This commit is contained in:
Treehugger Robot 2020-03-19 21:57:51 +00:00 committed by Gerrit Code Review
parent ddd7d0cac9 36b5e31f62
commit 0835c1b27a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/status/log.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"os"
"strings" "strings"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
@ -154,6 +155,7 @@ type errorProtoLog struct {
} }
func NewProtoErrorLog(log logger.Logger, filename string) StatusOutput { func NewProtoErrorLog(log logger.Logger, filename string) StatusOutput {
os.Remove(filename)
return &errorProtoLog{ return &errorProtoLog{
errorProto: soong_build_error_proto.BuildError{}, errorProto: soong_build_error_proto.BuildError{},
filename: filename, filename: filename,
@ -178,11 +180,17 @@ func (e *errorProtoLog) FinishAction(result ActionResult, counts Counts) {
} }
func (e *errorProtoLog) Flush() { func (e *errorProtoLog) Flush() {
// Don't create the build error proto file if there is action errors.
if len(e.errorProto.ActionErrors) == 0 {
return
}
data, err := proto.Marshal(&e.errorProto) data, err := proto.Marshal(&e.errorProto)
if err != nil { if err != nil {
e.log.Printf("Failed to marshal build status proto: %v\n", err) e.log.Printf("Failed to marshal build status proto: %v\n", err)
return return
} }
err = ioutil.WriteFile(e.filename, []byte(data), 0644) err = ioutil.WriteFile(e.filename, []byte(data), 0644)
if err != nil { if err != nil {
e.log.Printf("Failed to write file %s: %v\n", e.filename, err) e.log.Printf("Failed to write file %s: %v\n", e.filename, err)