backport of commit 9f8d831d94 (#19492)

Co-authored-by: Violet Hynes <violet.hynes@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-03-09 10:41:40 -05:00
committed by GitHub
parent 101e5359b5
commit dd63028d00
3 changed files with 78 additions and 3 deletions

View File

@@ -1359,9 +1359,12 @@ func (c *AgentCommand) reloadCerts() error {
defer c.tlsReloadFuncsLock.RUnlock()
for _, reloadFunc := range c.tlsReloadFuncs {
err := reloadFunc()
if err != nil {
errors = multierror.Append(errors, err)
// Non-TLS listeners will have a nil reload func.
if reloadFunc != nil {
err := reloadFunc()
if err != nil {
errors = multierror.Append(errors, err)
}
}
}