Move all output through StatusOutput
Write log output through StatusOutput so that the status implementation can synchronize it with its own output. Test: status_test.go Change-Id: I917bdeeea4759a12b6b4aa6d6d86ee18a2771723
This commit is contained in:
@@ -158,7 +158,10 @@ type mpContext struct {
|
||||
func main() {
|
||||
stdio := terminal.StdioImpl{}
|
||||
|
||||
log := logger.New(stdio.Stdout())
|
||||
output := terminal.NewStatusOutput(stdio.Stdout(), "",
|
||||
build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD"))
|
||||
|
||||
log := logger.New(output)
|
||||
defer log.Cleanup()
|
||||
|
||||
flag.Parse()
|
||||
@@ -171,8 +174,7 @@ func main() {
|
||||
|
||||
stat := &status.Status{}
|
||||
defer stat.Finish()
|
||||
stat.AddOutput(terminal.NewStatusOutput(stdio.Stdout(), "",
|
||||
build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD")))
|
||||
stat.AddOutput(output)
|
||||
|
||||
var failures failureCount
|
||||
stat.AddOutput(&failures)
|
||||
@@ -187,7 +189,7 @@ func main() {
|
||||
Context: ctx,
|
||||
Logger: log,
|
||||
Tracer: trace,
|
||||
Writer: stdio.Stdout(),
|
||||
Writer: output,
|
||||
Status: stat,
|
||||
}}
|
||||
|
||||
@@ -340,7 +342,7 @@ func main() {
|
||||
} else if failures > 1 {
|
||||
log.Fatalf("%d failures", failures)
|
||||
} else {
|
||||
fmt.Fprintln(stdio.Stdout(), "Success")
|
||||
fmt.Fprintln(output, "Success")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -465,3 +467,8 @@ func (f *failureCount) Message(level status.MsgLevel, message string) {
|
||||
}
|
||||
|
||||
func (f *failureCount) Flush() {}
|
||||
|
||||
func (f *failureCount) Write(p []byte) (int, error) {
|
||||
// discard writes
|
||||
return len(p), nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user