Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-21 11:23:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

improve container events watch robustness

Browse source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-05-26 12:17:37 +02:00
parent c16834cba6
commit 6f6ae071d6
No known key found for this signature in database
GPG key ID: 9858809D6F8F6E7E
5 changed files with 96 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/compose/api.go
View file

@ -379,7 +379,9 @@ type ContainerEvent struct {
Container string
Service string
Line string
ExitCode int
// ContainerEventExit only
ExitCode int
Restarting bool
}
const (

15
api/compose/printer.go
View file

@ -62,19 +62,22 @@ func (p *printer) Run(cascadeStop bool, exitCodeFrom string, stopFn func() error
containers := map[string]struct{}{}
for {
event := <-p.queue
container := event.Container
switch event.Type {
case UserCancel:
aborting = true
case ContainerEventAttach:
if _, ok := containers[event.Container]; ok {
if _, ok := containers[container]; ok {
continue
}
containers[event.Container] = struct{}{}
p.consumer.Register(event.Container)
containers[container] = struct{}{}
p.consumer.Register(container)
case ContainerEventExit:
delete(containers, event.Container)
if !event.Restarting {
delete(containers, container)
}
if !aborting {
p.consumer.Status(event.Container, fmt.Sprintf("exited with code %d", event.ExitCode))
p.consumer.Status(container, fmt.Sprintf("exited with code %d", event.ExitCode))
}
if cascadeStop {
if !aborting {
@ -99,7 +102,7 @@ func (p *printer) Run(cascadeStop bool, exitCodeFrom string, stopFn func() error
}
case ContainerEventLog:
if !aborting {
p.consumer.Log(event.Container, event.Service, event.Line)
p.consumer.Log(container, event.Service, event.Line)
}
}
}