diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-09 06:06:22 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-09 06:06:22 -0700 |
| commit | 924ef1c79a62ab97fe0c747395aad07d886a96e2 (patch) | |
| tree | fb4708b57bf777d2dc99e1fa90e8b66114a3b5f3 | |
| parent | a74041d483041345454e766c506dab1b567dec0d (diff) | |
| parent | 205a561e50c89f7b81336a295f97209d741cfa67 (diff) | |
| download | rails-924ef1c79a62ab97fe0c747395aad07d886a96e2.tar.gz rails-924ef1c79a62ab97fe0c747395aad07d886a96e2.tar.bz2 rails-924ef1c79a62ab97fe0c747395aad07d886a96e2.zip | |
Merge pull request #18417 from yoshiokatsuneo/active_record_connection_pool_error_disconnect
ActiveRecord: release connection on reconnect failure.
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 3 |
1 files changed, 3 insertions, 0 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 1371317e3c..6b5081b7a9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -453,6 +453,9 @@ module ActiveRecord c.verify! end c + rescue + disconnect! + raise end end |