Stop displaying logs when user cancels compose up, to not mix with stop progress display

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-02-23 15:13:51 +01:00
parent ea24e499e6
commit 3778b664af
2 changed files with 7 additions and 0 deletions

View File

@ -266,4 +266,6 @@ const (
ContainerEventAttach
// ContainerEventExit is a ContainerEvent of type exit. ExitCode is set
ContainerEventExit
// UserCancel user cancelled compose up, we are stopping containers
UserCancel
)

View File

@ -205,6 +205,9 @@ func runCreateStart(ctx context.Context, opts upOptions, services []string) erro
signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
go func() {
<-signalChan
queue <- compose.ContainerEvent{
Type: compose.UserCancel,
}
fmt.Println("Gracefully stopping...")
stopFunc() // nolint:errcheck
}()
@ -332,6 +335,8 @@ func (p printer) run(ctx context.Context, cascadeStop bool, exitCodeFrom string,
for {
event := <-p.queue
switch event.Type {
case compose.UserCancel:
aborting = true
case compose.ContainerEventAttach:
consumer.Register(event.Name, event.Source)
count++