Merge pull request #1 from lawlielt/lawlielt-patch-1

lawlielt · web-flow · commit 960b7a33618b · 2024-03-05T17:16:33.000+08:00
fix: fix the maxActiveConns sematic
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -169,7 +169,7 @@ func (p *ConnPool) newConn(ctx context.Context, pooled bool) (*Conn, error) {
 	}
 
 	p.connsMu.Lock()
-	if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {
+	if p.cfg.MaxActiveConns > 0 && len(p.conns) >= p.cfg.MaxActiveConns {
 		p.connsMu.Unlock()
 		return nil, ErrPoolExhausted
 	}
@@ -183,7 +183,7 @@ func (p *ConnPool) newConn(ctx context.Context, pooled bool) (*Conn, error) {
 	p.connsMu.Lock()
 	defer p.connsMu.Unlock()
 
-	if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {
+	if p.cfg.MaxActiveConns > 0 && len(p.conns) >= p.cfg.MaxActiveConns {
 		_ = cn.Close()
 		return nil, ErrPoolExhausted
 	}

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func (p ConnPool) newConn(ctx context.Context, pooled bool) (Conn, error) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`p.connsMu.Lock()`
`172`		`- if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {`
	`172`	`+ if p.cfg.MaxActiveConns > 0 && len(p.conns) >= p.cfg.MaxActiveConns {`
`173`	`173`	`p.connsMu.Unlock()`
`174`	`174`	`return nil, ErrPoolExhausted`
`175`	`175`	`}`
`@@ -183,7 +183,7 @@ func (p ConnPool) newConn(ctx context.Context, pooled bool) (Conn, error) {`
`183`	`183`	`p.connsMu.Lock()`
`184`	`184`	`defer p.connsMu.Unlock()`
`185`	`185`
`186`		`- if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {`
	`186`	`+ if p.cfg.MaxActiveConns > 0 && len(p.conns) >= p.cfg.MaxActiveConns {`
`187`	`187`	`_ = cn.Close()`
`188`	`188`	`return nil, ErrPoolExhausted`
`189`	`189`	`}`