File tree Expand file tree Collapse file tree 1 file changed +8
-14
lines changed
Expand file tree Collapse file tree 1 file changed +8
-14
lines changed Original file line number Diff line number Diff 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 {
You can’t perform that action at this time.
0 commit comments