kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

small reformatting jsonmessage

This commit is contained in:
Guillaume J. Charmes 2013-12-02 11:49:11 -08:00
parent 6ea3b9651b
commit 5cd09dc115
No known key found for this signature in database
GPG Key ID: B33E4642CB6E3FF3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
utils/jsonmessage.go
View File

@ -59,7 +59,7 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
}
return jm.Error
}
endl := ""
var endl string
if isTerminal {
// <ESC>[2K = erase entire current line
fmt.Fprintf(out, "%c[2K\r", 27)
@ -85,14 +85,17 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
}
func DisplayJSONMessagesStream(in io.Reader, out io.Writer, isTerminal bool) error {
dec := json.NewDecoder(in)
ids := make(map[string]int)
diff := 0
var (
dec = json.NewDecoder(in)
ids = make(map[string]int)
diff = 0
)
for {
jm := JSONMessage{}
if err := dec.Decode(&jm); err == io.EOF {
break
} else if err != nil {
var jm JSONMessage
if err := dec.Decode(&jm); err != nil {
if err == io.EOF {
break
}
return err
}
if (jm.Progress != nil || jm.ProgressMessage != "") && jm.ID != "" {