fix embedded derp spam

ethanndickson · ethanndickson · commit 783162191d54 · 2024-10-30T07:46:05.000Z
diff --git a/coderd/tailnet.go b/coderd/tailnet.go
@@ -76,7 +76,7 @@ func NewServerTailnet(
 	// given in this callback, it's only valid while connecting.
 	if derpServer != nil {
 		conn.SetDERPRegionDialer(func(_ context.Context, region *tailcfg.DERPRegion) net.Conn {
-			if !region.EmbeddedRelay {
+			if !region.EmbeddedRelay || ctx.Err() != nil {
 				return nil
 			}
 			logger.Debug(ctx, "connecting to embedded DERP via in-memory pipe")

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func NewServerTailnet(`
`76`	`76`	`// given in this callback, it's only valid while connecting.`
`77`	`77`	`if derpServer != nil {`
`78`	`78`	`conn.SetDERPRegionDialer(func(_ context.Context, region *tailcfg.DERPRegion) net.Conn {`
`79`		`- if !region.EmbeddedRelay {`
	`79`	`+ if !region.EmbeddedRelay \|\| ctx.Err() != nil {`
`80`	`80`	`return nil`
`81`	`81`	`}`
`82`	`82`	`logger.Debug(ctx, "connecting to embedded DERP via in-memory pipe")`