From 6bec6515d7f1909cfe4c979d010681782b687def Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Thu, 3 Sep 2020 08:56:28 +0200 Subject: [PATCH] added shutdown message --- x-pack/elastic-agent/pkg/agent/cmd/run.go | 4 ++++ x-pack/elastic-agent/pkg/agent/control/server/listener.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/x-pack/elastic-agent/pkg/agent/cmd/run.go b/x-pack/elastic-agent/pkg/agent/cmd/run.go index f502ef9cf49..74cf010cc66 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/run.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/run.go @@ -128,12 +128,16 @@ func run(flags *globalFlags, streams *cli.IOStreams) error { } } if breakout { + if !reexecing { + logger.Info("Shutting down Elastic Agent and sending last events...") + } break } } err = app.Stop() if !reexecing { + logger.Info("Shutting down completed.") return err } rex.ShutdownComplete() diff --git a/x-pack/elastic-agent/pkg/agent/control/server/listener.go b/x-pack/elastic-agent/pkg/agent/control/server/listener.go index bf03f54e2da..7edfc7b8ee9 100644 --- a/x-pack/elastic-agent/pkg/agent/control/server/listener.go +++ b/x-pack/elastic-agent/pkg/agent/control/server/listener.go @@ -23,7 +23,7 @@ func createListener(log *logger.Logger) (net.Listener, error) { path := strings.TrimPrefix(control.Address(), "unix://") if _, err := os.Stat(path); !os.IsNotExist(err) { err = os.Remove(path) - if err != nil { + if err != nil && !os.IsNotExist(err) { log.Errorf("%s", errors.New(err, fmt.Sprintf("Failed to cleanup %s", path), errors.TypeFilesystem, errors.M("path", path))) } }