jdb/fiber-orm-nim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: don't try to cull connections from an empty pool.

Browse Source 
The first step in culling connections was to take a subset of the pool's
connections from index 0 to numToCull. This leads to an error if
numToCull is also zero.
This commit is contained in:
Jonathan Bernard 2022-06-04 10:42:54 -05:00
parent 9625ac6a5e
commit ca67082341
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fiber_orm.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "1.0.1" version = "1.0.2"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Lightweight Postgres ORM for Nim." description = "Lightweight Postgres ORM for Nim."
license = "GPL-3.0" license = "GPL-3.0"

18
src/fiber_orm/pool.nim
View File

@ -62,14 +62,16 @@ proc maintain(pool: DbConnPool): void =
let freeConns = pool.conns.filterIt(it.free) let freeConns = pool.conns.filterIt(it.free)
if pool.conns.len > pool.cfg.poolSize and freeConns.len > 0: if pool.conns.len > pool.cfg.poolSize and freeConns.len > 0:
let numToCull = min(freeConns.len, pool.conns.len - pool.cfg.poolSize) let numToCull = min(freeConns.len, pool.conns.len - pool.cfg.poolSize)
let toCull = freeConns[0..numToCull]
pool.conns.keepIf((pc) => toCull.allIt(it.id != pc.id)) if numToCull > 0:
for culled in toCull: let toCull = freeConns[0..numToCull]
try: culled.conn.close() pool.conns.keepIf((pc) => toCull.allIt(it.id != pc.id))
except: discard "" for culled in toCull:
log().debug( try: culled.conn.close()
"Trimming pool size. Culled $# free connections. $# connections remaining." % except: discard ""
[$toCull.len, $pool.conns.len]) log().debug(
"Trimming pool size. Culled $# free connections. $# connections remaining." %
[$toCull.len, $pool.conns.len])
proc take*(pool: DbConnPool): tuple[id: int, conn: DbConn] = proc take*(pool: DbConnPool): tuple[id: int, conn: DbConn] =
pool.maintain pool.maintain