Apr 29, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
diff --git a/agent/agent.go b/agent/agent.go
 }()
 if err = a.trackGoroutine(func() {
 defer apiListener.Close()
 apiHandler, closeAPIHAndler := a.apiHandler()
 defer func() {
 _ = closeAPIHAndler()
 }()
 server := &http.Server{
 Handler:           a.apiHandler(),
 BaseContext:       func(net.Listener) context.Context { return ctx },
 Handler:           apiHandler,
 ReadTimeout:       20 * time.Second,
 ReadHeaderTimeout: 20 * time.Second,
 WriteTimeout:      20 * time.Second,
 case <-ctx.Done():
 case <-a.hardCtx.Done():
 }
 _ = closeAPIHAndler()
 _ = server.Close()
 }()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1481,8 +1481,13 @@ func (a *agent) createTailnet(
		}()
		if err = a.trackGoroutine(func() {
		defer apiListener.Close()
		apiHandler, closeAPIHAndler := a.apiHandler()
		defer func() {
		_ = closeAPIHAndler()
		}()
		server := &http.Server{
		Handler: a.apiHandler(),
		BaseContext: func(net.Listener) context.Context { return ctx },
Copy link MemberAuthor mafredriApr 28, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Review: This change allows all`r.Context`s to inherit the graceful context from the agent, ensuring cancellation on agent shutdown.
		Handler: apiHandler,
		ReadTimeout: 20 * time.Second,
		ReadHeaderTimeout: 20 * time.Second,
		WriteTimeout: 20 * time.Second,
Expand All		@@ -1493,6 +1498,7 @@ func (a *agent) createTailnet(
		case <-ctx.Done():
		case <-a.hardCtx.Done():
		}
		_ = closeAPIHAndler()
		_ = server.Close()
mafredri marked this conversation as resolved. Show resolvedHide resolved
		}()

Expand Down