Merge pull request #1596 from 4el0ve4ek/fix_close_item_context

asmyasnikov · web-flow · commit 44135d13bdfc · 2024-12-23T10:49:00.000+03:00
fix context which is used for closing session
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Fixed connections pool leak on closing sessions
 * Fixed an error in logging session deletion events
 
 ## v3.95.3
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -302,7 +302,7 @@ func makeAsyncCloseItemFunc[PT ItemConstraint[T], T any](
 			defer closeItemCancel()
 
 			if d := p.config.closeTimeout; d > 0 {
-				closeItemCtx, closeItemCancel = xcontext.WithTimeout(ctx, d)
+				closeItemCtx, closeItemCancel = xcontext.WithTimeout(closeItemCtx, d)
 				defer closeItemCancel()
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* Fixed connections pool leak on closing sessions`
`1`	`2`	`* Fixed an error in logging session deletion events`
`2`	`3`
`3`	`4`	`## v3.95.3`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func makeAsyncCloseItemFunc[PT ItemConstraint[T], T any](`
`302`	`302`	`defer closeItemCancel()`
`303`	`303`
`304`	`304`	`if d := p.config.closeTimeout; d > 0 {`
`305`		`- closeItemCtx, closeItemCancel = xcontext.WithTimeout(ctx, d)`
	`305`	`+ closeItemCtx, closeItemCancel = xcontext.WithTimeout(closeItemCtx, d)`
`306`	`306`	`defer closeItemCancel()`
`307`	`307`	`}`
`308`	`308`