log --follow must stop when container get killed

Signed-off-by: Nicolas De Loof <[email protected]>
docker · Oct 1, 2021 · d9cf22c · d9cf22c
1 parent 0a81a98
commit d9cf22c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go
@@ -35,12 +35,16 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
 
 	eg, ctx := errgroup.WithContext(ctx)
 	if options.Follow {
+		printer := newLogPrinter(consumer)
 		eg.Go(func() error {
-			printer := newLogPrinter(consumer)
 			return s.watchContainers(ctx, projectName, options.Services, printer.HandleEvent, containers, func(c types.Container) error {
 				return s.logContainers(ctx, consumer, c, options)
 			})
 		})
+		eg.Go(func() error {
+			_, err := printer.Run(false, "", nil)
+			return err
+		})
 	}
 
 	for _, c := range containers {

diff --git a/pkg/compose/start.go b/pkg/compose/start.go
@@ -90,7 +90,7 @@ func (s *composeService) watchContainers(ctx context.Context, projectName string
 			}
 			name := getContainerNameWithoutProject(container)
 
-			if event.Status == "die" {
+			if event.Status == "die" || event.Status == "kill"{
 				restarted := watched[container.ID]
 				watched[container.ID] = restarted + 1
 				// Container terminated.