Skip to content

Commit

Permalink
feat(error): close resources on resource lost (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
stakach authored Sep 10, 2021
1 parent 6dc3f2d commit a25f336
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
15 changes: 15 additions & 0 deletions spec/database_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,21 @@ describe DB::Database do
end
end

it "should close connection on ConnectionLost" do
DummyDriver::DummyConnection.clear_connections
DB.open "dummy://localhost:1027?initial_pool_size=1&max_pool_size=1&retry_attempts=1" do |db|
db.exec("stmt1")
DummyDriver::DummyConnection.connections.size.should eq(1)
connection = DummyDriver::DummyConnection.connections.first
connection.disconnect!
connection.closed?.should be_false
db.exec("stmt1")
# A new connection was used for the last statement
DummyDriver::DummyConnection.connections.size.should eq(2)
connection.closed?.should be_true
end
end

describe "prepared_statements connection option" do
it "defaults to true" do
with_dummy "dummy://localhost:1027" do |db|
Expand Down
1 change: 1 addition & 0 deletions src/db/error.cr
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module DB
getter resource : T

def initialize(@resource : T)
@resource.close
end
end

Expand Down
8 changes: 5 additions & 3 deletions src/db/pool.cr
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,12 @@ module DB
sleep @retry_delay if i >= current_available
return yield
rescue e : PoolResourceLost(T)
# if the connection is lost close it to release resources
# and remove it from the known pool.
# if the connection is lost it will be closed by
# the exception to release resources
# we still need to remove it from the known pool.
# Closed connection will be evicted from statement cache
# in PoolPreparedStatement#clean_connections
sync { delete(e.resource) }
e.resource.close
rescue e : PoolResourceRefused
# a ConnectionRefused means a new connection
# was intended to be created
Expand Down

0 comments on commit a25f336

Please sign in to comment.