From 08b015978af87cf3be96c2f4b929d1081e9a9692 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Tue, 27 Apr 2021 07:46:55 -0400 Subject: [PATCH] [Elastic Agent] Reduce log level for listener cleanup to debug (#25274) * Cleanup log message for cleanupListener. * Add changelog. --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 + .../elastic-agent/pkg/agent/control/server/listener.go | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index 82cbbaa892b..c3dc8b38ce2 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -55,6 +55,7 @@ - Fixed: limit for retries to Kibana configurable {issue}25063[25063] - Fix issue with status and inspect inside of container {pull}25204[25204] - Remove FLEET_SERVER_POLICY_NAME env variable as it was not used {pull}25149[25149] +- Reduce log level for listener cleanup to debug {pull}25274 ==== New features 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 3090f3d140d..02ef034ac38 100644 --- a/x-pack/elastic-agent/pkg/agent/control/server/listener.go +++ b/x-pack/elastic-agent/pkg/agent/control/server/listener.go @@ -21,10 +21,7 @@ import ( 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 && !os.IsNotExist(err) { - log.Errorf("%s", errors.New(err, fmt.Sprintf("Failed to cleanup %s", path), errors.TypeFilesystem, errors.M("path", path))) - } + cleanupListener(log) } dir := filepath.Dir(path) if _, err := os.Stat(dir); os.IsNotExist(err) { @@ -48,7 +45,7 @@ func createListener(log *logger.Logger) (net.Listener, error) { func cleanupListener(log *logger.Logger) { path := strings.TrimPrefix(control.Address(), "unix://") - if err := os.Remove(path); err != nil { - log.Errorf("%s", errors.New(err, fmt.Sprintf("Failed to cleanup %s", path), errors.TypeFilesystem, errors.M("path", path))) + if err := os.Remove(path); err != nil && !os.IsNotExist(err) { + log.Debug("%s", errors.New(err, fmt.Sprintf("Failed to cleanup %s", path), errors.TypeFilesystem, errors.M("path", path))) } }