vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Fix progress reader output on close

Browse source 
Currently the progress reader won't close properly by not setting the close size.

fixes #11849

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2015-03-31 13:17:25 -07:00
parent dce6f8ba76
commit 4844f711fb
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
progressreader/progressreader.go
View file

@ -1,9 +1,10 @@
package progressreader package progressreader
import ( import (
"io"
"github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/streamformatter" "github.com/docker/docker/pkg/streamformatter"
"io"
) )
// Reader with progress bar // Reader with progress bar
@ -43,6 +44,7 @@ func (config *Config) Read(p []byte) (n int, err error) {
return read, err return read, err
} }
func (config *Config) Close() error { func (config *Config) Close() error {
config.Current = config.Size
config.Out.Write(config.Formatter.FormatProgress(config.ID, config.Action, &jsonmessage.JSONProgress{Current: config.Current, Total: config.Size})) config.Out.Write(config.Formatter.FormatProgress(config.ID, config.Action, &jsonmessage.JSONProgress{Current: config.Current, Total: config.Size}))
return config.In.Close() return config.In.Close()
} }