diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-13 12:31:52 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-13 12:31:52 -0700 |
| commit | 850159bd2c5e1e108d0256dd05424bbbf7926b59 (patch) | |
| tree | 5c232d841b5c75f81746b7863494a9e839b4f56e /activerecord/lib/active_record | |
| parent | 6cf71be0ae6f4dc9b6f4a540e48fed9be43a3f09 (diff) | |
| parent | 33fdb7f2929f57f7453299f231b2762954212611 (diff) | |
| download | rails-850159bd2c5e1e108d0256dd05424bbbf7926b59.tar.gz rails-850159bd2c5e1e108d0256dd05424bbbf7926b59.tar.bz2 rails-850159bd2c5e1e108d0256dd05424bbbf7926b59.zip | |
Merge pull request #18478 from yoshiokatsuneo/active_record_connection_pool_error_disconnect
ActiveRecord: On reconnection failure, release only failed connetion.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 6b5081b7a9..d99dc9a5db 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -454,7 +454,8 @@ module ActiveRecord end c rescue - disconnect! + remove c + c.disconnect! raise end end |