Skip to content

Commit 2e5f09c

Browse files
wpjuniorCopilot
andauthored
Update tsuru/formatter/stream.go
Co-authored-by: Copilot <[email protected]>
1 parent 2c7dd8a commit 2e5f09c

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

tsuru/formatter/stream.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,19 @@ func StreamJSONResponse(w io.Writer, response *http.Response) error {
1919
return errors.New("response cannot be nil")
2020
}
2121

22+
var writer io.Writer
23+
var formatter *tsuruIO.SimpleJsonMessageFormatter
2224
if v2.ColorStream() {
23-
output := tsuruIO.NewStreamWriter(NewColoredStreamWriter(w), &tsuruIO.SimpleJsonMessageFormatter{NoTimestamp: true})
24-
defer response.Body.Close()
25-
var err error
26-
for n := int64(1); n > 0 && err == nil; n, err = io.Copy(output, response.Body) {
27-
}
28-
if err != nil {
29-
return err
30-
}
31-
unparsed := output.Remaining()
32-
if len(unparsed) > 0 {
33-
return errors.Errorf("unparsed message error: %s", string(unparsed))
34-
}
35-
return nil
25+
writer = NewColoredStreamWriter(w)
26+
formatter = &tsuruIO.SimpleJsonMessageFormatter{NoTimestamp: true}
27+
} else {
28+
writer = w
29+
formatter = nil
3630
}
3731

3832
defer response.Body.Close()
33+
output := tsuruIO.NewStreamWriter(writer, formatter)
3934
var err error
40-
output := tsuruIO.NewStreamWriter(w, nil)
4135
for n := int64(1); n > 0 && err == nil; n, err = io.Copy(output, response.Body) {
4236
}
4337
if err != nil {

0 commit comments

Comments
 (0)