Only account running containers for logs

laurazard · laurazard · commit 220626ec5efa · 2023-01-20T13:30:05.000+01:00
Signed-off-by: Laura Brehm &lt;laurabrehm@hey.com&gt;
diff --git a/pkg/compose/containers.go b/pkg/compose/containers.go
@@ -99,6 +99,12 @@ func isService(services ...string) containerPredicate {
 	}
 }
 
+func isRunning() containerPredicate {
+	return func(c moby.Container) bool {
+		return c.State == "running"
+	}
+}
+
 func isNotService(services ...string) containerPredicate {
 	return func(c moby.Container) bool {
 		service := c.Labels[api.ServiceLabel]
diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go
@@ -72,6 +72,7 @@ func (s *composeService) Logs(
 	}
 
 	if options.Follow {
+		containers = containers.filter(isRunning())
 		printer := newLogPrinter(consumer)
 		eg.Go(func() error {
 			_, err := printer.Run(false, "", nil)

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,12 @@ func isService(services ...string) containerPredicate {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
	`102`	`+func isRunning() containerPredicate {`
	`103`	`+ return func(c moby.Container) bool {`
	`104`	`+ return c.State == "running"`
	`105`	`+ }`
	`106`	`+}`
	`107`	`+`
`102`	`108`	`func isNotService(services ...string) containerPredicate {`
`103`	`109`	`return func(c moby.Container) bool {`
`104`	`110`	`service := c.Labels[api.ServiceLabel]`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ func (s *composeService) Logs(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if options.Follow {`
	`75`	`+ containers = containers.filter(isRunning())`
`75`	`76`	`printer := newLogPrinter(consumer)`
`76`	`77`	`eg.Go(func() error {`
`77`	`78`	`_, err := printer.Run(false, "", nil)`