From cf3535458ec1d2d0bb45696805f0451865fd8c0e Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Mon, 26 Nov 2018 18:17:07 +0800 Subject: [PATCH] Stop docker and console first to avoid zombie processes --- cmd/control/switch_console.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/control/switch_console.go b/cmd/control/switch_console.go index 2aac8439..4c69feaa 100644 --- a/cmd/control/switch_console.go +++ b/cmd/control/switch_console.go @@ -25,6 +25,14 @@ func switchConsoleAction(c *cli.Context) error { return err } + // stop docker and console to avoid zombie process + if err = project.Stop(context.Background(), 10, "docker"); err != nil { + log.Errorf("Failed to stop Docker: %v", err) + } + if err = project.Stop(context.Background(), 10, "console"); err != nil { + log.Errorf("Failed to stop console: %v", err) + } + if newConsole != "default" { if err = compose.LoadSpecialService(project, cfg, "console", newConsole); err != nil { return err @@ -41,8 +49,8 @@ func switchConsoleAction(c *cli.Context) error { return err } - if err = project.Restart(context.Background(), 10, "docker"); err != nil { - log.Errorf("Failed to restart Docker: %v", err) + if err = project.Start(context.Background(), "docker"); err != nil { + log.Errorf("Failed to start Docker: %v", err) } return nil