diff options
author | Colin Cross <ccross@android.com> | 2019-06-09 19:40:08 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-06-12 21:30:56 -0700 |
commit | e0df1a36b265ce271a9a723a09ecf892ffefe36f (patch) | |
tree | 7c6ec9f984ddc388cf5479b127500cdac7fa0038 /cmd/multiproduct_kati | |
parent | 097ed2a37cca619a9be0e109a108f3d474b576d1 (diff) | |
download | soong-e0df1a36b265ce271a9a723a09ecf892ffefe36f.tar.gz |
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
Diffstat (limited to 'cmd/multiproduct_kati')
-rw-r--r-- | cmd/multiproduct_kati/main.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go index c976dcb45..1171a6521 100644 --- a/cmd/multiproduct_kati/main.go +++ b/cmd/multiproduct_kati/main.go @@ -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 +} |