beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29747 from xlgao-zju/break-the-for

Browse source 
exit collect when we get EOF
This commit is contained in:
Vincent Demeester 2017-02-01 22:29:18 +01:00 committed by GitHub
commit 3c64061b67
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/command/container/stats_helpers.go
View file

@ -152,11 +152,13 @@ func collect(ctx context.Context, s *formatter.ContainerStats, cli client.APICli
waitFirst.Done() waitFirst.Done()
} }
case err := <-u: case err := <-u:
if err != nil {
s.SetError(err) s.SetError(err)
if err == io.EOF {
break
}
if err != nil {
continue continue
} }
s.SetError(nil)
// if this is the first stat you get, release WaitGroup // if this is the first stat you get, release WaitGroup
if !getFirst { if !getFirst {
getFirst = true getFirst = true