From 1c0d71a58e3aed0c602d320c16cbe18a15498d3e Mon Sep 17 00:00:00 2001 From: Violet Hynes Date: Mon, 4 Mar 2024 14:48:46 -0500 Subject: [PATCH] Fix lock issue for Agent and Proxy (#25771) --- command/agent.go | 2 ++ command/proxy.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/command/agent.go b/command/agent.go index 3c1643856f..d45cfe5bc3 100644 --- a/command/agent.go +++ b/command/agent.go @@ -565,6 +565,7 @@ func (c *AgentCommand) Run(args []string) int { lnBundle, err := cache.StartListener(lnConfig) if err != nil { c.UI.Error(fmt.Sprintf("Error starting listener: %v", err)) + c.tlsReloadFuncsLock.Unlock() return 1 } @@ -587,6 +588,7 @@ func (c *AgentCommand) Run(args []string) int { }, leaseCache) if err != nil { c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err)) + c.tlsReloadFuncsLock.Unlock() return 1 } sinks = append(sinks, &sink.SinkConfig{ diff --git a/command/proxy.go b/command/proxy.go index 79138d745b..82b0dce67a 100644 --- a/command/proxy.go +++ b/command/proxy.go @@ -548,6 +548,7 @@ func (c *ProxyCommand) Run(args []string) int { lnBundle, err := cache.StartListener(lnConfig) if err != nil { c.UI.Error(fmt.Sprintf("Error starting listener: %v", err)) + c.tlsReloadFuncsLock.Unlock() return 1 } @@ -570,6 +571,7 @@ func (c *ProxyCommand) Run(args []string) int { }, leaseCache) if err != nil { c.UI.Error(fmt.Sprintf("Error creating inmem sink for cache: %v", err)) + c.tlsReloadFuncsLock.Unlock() return 1 } sinks = append(sinks, &sink.SinkConfig{