tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interrupt printer when `compose log` is cancelled 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-11-15 08:48:31 +01:00 committed by Nicolas De loof
parent 413f46ade0
commit 7205d918ad
3 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/compose/logs.go
View File

@ -42,7 +42,7 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
})
})
eg.Go(func() error {
_, err := printer.Run(false, "", nil)
_, err := printer.Run(ctx, false, "", nil)
return err
})
}

12
pkg/compose/printer.go
View File

@ -17,6 +17,7 @@
package compose
import (
"context"
"fmt"
"github.com/docker/compose/v2/pkg/api"
@ -27,7 +28,7 @@ import (
// logPrinter watch application containers an collect their logs
type logPrinter interface {
HandleEvent(event api.ContainerEvent)
Run(cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error)
Run(ctx context.Context, cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error)
Cancel()
}
@ -56,14 +57,18 @@ func (p *printer) HandleEvent(event api.ContainerEvent) {
p.queue <- event
}
func (p *printer) Run(cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error) {
//nolint:gocyclo
func (p *printer) Run(ctx context.Context, cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error) {
var (
aborting bool
exitCode int
)
containers := map[string]struct{}{}
for {
event := <-p.queue
select {
case <-ctx.Done():
return exitCode, ctx.Err()
case event := <-p.queue:
container := event.Container
switch event.Type {
case api.UserCancel:
@ -108,4 +113,5 @@ func (p *printer) Run(cascadeStop bool, exitCodeFrom string, stopFn func() error
}
}
}
}
}

2
pkg/compose/up.go
View File

@ -80,7 +80,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
var exitCode int
eg, ctx := errgroup.WithContext(ctx)
eg.Go(func() error {
code, err := printer.Run(options.Start.CascadeStop, options.Start.ExitCodeFrom, stopFunc)
code, err := printer.Run(context.Background(), options.Start.CascadeStop, options.Start.ExitCodeFrom, stopFunc)
exitCode = code
return err
})