Skip to content

Commit

Permalink
[Elastic Agent] Reduce log level for listener cleanup to debug (#25274)
Browse files Browse the repository at this point in the history
* Cleanup log message for cleanupListener.

* Add changelog.
  • Loading branch information
blakerouse authored Apr 27, 2021
1 parent 1370927 commit 08b0159
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
1 change: 1 addition & 0 deletions x-pack/elastic-agent/CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 3 additions & 6 deletions x-pack/elastic-agent/pkg/agent/control/server/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)))
}
}

0 comments on commit 08b0159

Please sign in to comment.