core/connpool: exit early from infinite for-loop if pool closed

celzero · Oct 19, 2024 · 4b42383 · 4b42383 · ignoramous · Oct 20, 2024
1 parent 9539876
commit 4b42383
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/intra/core/connpool.go b/intra/core/connpool.go
@@ -223,10 +223,11 @@ func (c *ConnPool[T]) clean() {
 }
 
 func (c *ConnPool[T]) scrub() {
-	if c.closed.Load() {
-		return
-	}
 	for {
+		if c.closed.Load() {
+			return
+		}
+
 		select {
 		case conn := <-c.p:
 			if readable(conn) {
@@ -242,6 +243,7 @@ func (c *ConnPool[T]) scrub() {
 				clos(conn)
 			}
 		case <-c.ctx.Done():
+			return
 		default:
 			return
 		}