Skip to content

Commit

Permalink
Cherry-pick #15946 to 7.x: Remove debug logging from keystore (#15969)
Browse files Browse the repository at this point in the history
The keystore is loaded before the configuration file is loaded, which
means that some debug messages are never printed, because logging is still
not initialized (logs will be discarded).

(cherry picked from commit 56924a3)
  • Loading branch information
Steffen Siering authored Jan 31, 2020
1 parent 8da2bfe commit d6e2963
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions libbeat/keystore/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"fmt"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/logp"
ucfg "github.com/elastic/go-ucfg"
)

Expand Down Expand Up @@ -87,7 +86,6 @@ func Factory(cfg *common.Config, defaultPath string) (Keystore, error) {
config.Path = defaultPath
}

logp.Debug("keystore", "Loading file keystore from %s", config.Path)
keystore, err := NewFileKeystore(config.Path)
return keystore, err
}
Expand Down Expand Up @@ -122,7 +120,6 @@ func ResolverWrap(keystore Keystore) func(string) (string, error) {
return "", err
}

logp.Debug("keystore", "accessing key '%s' from the keystore", keyName)
return string(v), nil
}
}

0 comments on commit d6e2963

Please sign in to comment.