Merge pull request #18478 from yoshiokatsuneo/active_record_connection_pool_error_disconnect

ActiveRecord: On reconnection failure, release only failed connetion.
2015-01-13 12:31:52 -07:00 · 2015-01-13 12:31:52 -07:00 · 850159bd2c
parent 6cf71be0ae 33fdb7f292
commit 850159bd2c
1 changed files with 2 additions and 1 deletions
--- 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