Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Progress functions can return a string, that can be used in the caller of progress.Run to display final result after progress display

Browse source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-09-14 10:01:59 +02:00
parent 9c07a7b3ad
commit 267b267201
6 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
progress/writer.go
View file

@ -77,15 +77,16 @@ func ContextWriter(ctx context.Context) Writer {
return s
}
type progressFunc func(context.Context) error
type progressFunc func(context.Context) (string, error)
// Run will run a writer and the progress function
// in parallel
func Run(ctx context.Context, pf progressFunc) error {
func Run(ctx context.Context, pf progressFunc) (string, error) {
eg, _ := errgroup.WithContext(ctx)
w, err := NewWriter(os.Stderr)
var result string
if err != nil {
return err
return "", err
}
eg.Go(func() error {
return w.Start(context.Background())
@ -95,10 +96,15 @@ func Run(ctx context.Context, pf progressFunc) error {
eg.Go(func() error {
defer w.Stop()
return pf(ctx)
s, err := pf(ctx)
if err == nil {
result = s
}
return err
})
return eg.Wait()
err = eg.Wait()
return result, err
}
// NewWriter returns a new multi-progress writer