scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 18:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lock issue for Agent and Proxy (#25771)

Browse Source
This commit is contained in:
Violet Hynes
2024-03-04 14:48:46 -05:00
committed by GitHub
parent ba193334ce
commit 1c0d71a58e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent.go
View File

@@ -565,6 +565,7 @@ func (c *AgentCommand) Run(args []string) int {
lnBundle, err := cache.StartListener(lnConfig) lnBundle, err := cache.StartListener(lnConfig)
if err != nil { if err != nil {
c.UI.Error(fmt.Sprintf("Error starting listener: %v", err)) c.UI.Error(fmt.Sprintf("Error starting listener: %v", err))
c.tlsReloadFuncsLock.Unlock()
return 1 return 1
} }
@@ -587,6 +588,7 @@ func (c *AgentCommand) Run(args []string) int {
}, leaseCache) }, leaseCache)
if err != nil { if err != nil {
c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err)) c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err))
c.tlsReloadFuncsLock.Unlock()
return 1 return 1
} }
sinks = append(sinks, &sink.SinkConfig{ sinks = append(sinks, &sink.SinkConfig{

2
command/proxy.go
View File

@@ -548,6 +548,7 @@ func (c *ProxyCommand) Run(args []string) int {
lnBundle, err := cache.StartListener(lnConfig) lnBundle, err := cache.StartListener(lnConfig)
if err != nil { if err != nil {
c.UI.Error(fmt.Sprintf("Error starting listener: %v", err)) c.UI.Error(fmt.Sprintf("Error starting listener: %v", err))
c.tlsReloadFuncsLock.Unlock()
return 1 return 1
} }
@@ -570,6 +571,7 @@ func (c *ProxyCommand) Run(args []string) int {
}, leaseCache) }, leaseCache)
if err != nil { if err != nil {
c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err)) c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err))
c.tlsReloadFuncsLock.Unlock()
return 1 return 1
} }
sinks = append(sinks, &sink.SinkConfig{ sinks = append(sinks, &sink.SinkConfig{