Skip to content

Commit f35ece5

Browse files
committed
remove deadlock
1 parent d8175a6 commit f35ece5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

logger.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ import (
99
"sync/atomic"
1010
"time"
1111

12-
"cdr.dev/slog"
13-
"github.com/coder/coder/codersdk"
14-
"github.com/coder/coder/codersdk/agentsdk"
1512
"github.com/fatih/color"
1613
appsv1 "k8s.io/api/apps/v1"
1714
corev1 "k8s.io/api/core/v1"
@@ -20,6 +17,10 @@ import (
2017
"k8s.io/client-go/kubernetes"
2118
"k8s.io/client-go/tools/cache"
2219

20+
"cdr.dev/slog"
21+
"github.com/coder/coder/codersdk"
22+
"github.com/coder/coder/codersdk/agentsdk"
23+
2324
// *Never* remove this. Certificates are not bundled as part
2425
// of the container, so this is necessary for all connections
2526
// to not be insecure.
@@ -300,9 +301,7 @@ func (p *podEventLogger) init() error {
300301
// If a logger already exists for the token, it's returned. Otherwise a new
301302
// logger is created and returned.
302303
func (p *podEventLogger) sendLog(resourceName, token string, log agentsdk.StartupLog) {
303-
p.mutex.Lock()
304304
logger, ok := p.agentTokenToLogger[token]
305-
p.mutex.Unlock()
306305
if !ok {
307306
client := agentsdk.New(p.coderURL)
308307
client.SetSessionToken(token)

0 commit comments

Comments
 (0)