Prechádzať zdrojové kódy

Merge pull request #8726 from ndeloof/log_follow_killed

`log --follow` must stop when container get killed
Ulysses Souza 4 rokov pred
rodič
commit
0062703bea
1 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  1. 5 1
      pkg/compose/logs.go

+ 5 - 1
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 {