From 9b055c31fe3143d7941375350853a023fa959921 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Wed, 22 Sep 2021 10:09:04 +0200 Subject: [PATCH] "log" must stop watching on SIGTERM Signed-off-by: Nicolas De Loof --- pkg/compose/logs.go | 2 +- pkg/compose/start.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go index fcf1ca28d..5544c4923 100644 --- a/pkg/compose/logs.go +++ b/pkg/compose/logs.go @@ -37,7 +37,7 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer if options.Follow { eg.Go(func() error { printer := newLogPrinter(consumer) - return s.watchContainers(projectName, options.Services, printer.HandleEvent, containers, func(c types.Container) error { + return s.watchContainers(ctx, projectName, options.Services, printer.HandleEvent, containers, func(c types.Container) error { return s.logContainers(ctx, consumer, c, options) }) }) diff --git a/pkg/compose/start.go b/pkg/compose/start.go index cd0aa66bb..273fee6ab 100644 --- a/pkg/compose/start.go +++ b/pkg/compose/start.go @@ -47,7 +47,7 @@ func (s *composeService) start(ctx context.Context, project *types.Project, opti } eg.Go(func() error { - return s.watchContainers(project.Name, options.AttachTo, listener, attached, func(container moby.Container) error { + return s.watchContainers(context.Background(), project.Name, options.AttachTo, listener, attached, func(container moby.Container) error { return s.attachContainer(ctx, container, listener, project) }) }) @@ -69,13 +69,13 @@ func (s *composeService) start(ctx context.Context, project *types.Project, opti type containerWatchFn func(container moby.Container) error // watchContainers uses engine events to capture container start/die and notify ContainerEventListener -func (s *composeService) watchContainers(projectName string, services []string, listener api.ContainerEventListener, containers Containers, onStart containerWatchFn) error { +func (s *composeService) watchContainers(ctx context.Context, projectName string, services []string, listener api.ContainerEventListener, containers Containers, onStart containerWatchFn) error { watched := map[string]int{} for _, c := range containers { watched[c.ID] = 0 } - ctx, stop := context.WithCancel(context.Background()) + ctx, stop := context.WithCancel(ctx) err := s.Events(ctx, projectName, api.EventsOptions{ Services: services, Consumer: func(event api.Event) error {