diff options
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index 5ef200fd97..4ef31e8beb 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -1,28 +1,4 @@ module ActiveRecord - module ConnectionAdapters - module ConnectionManagement - # Check whether the connection should be checked for activity before use. - def needs_verification? - @needs_verification == true - end - - # Flag the connection for an activity check before use. - def needs_verification! - @needs_verification = true - end - - # If the connection is flagged for an activity check, check whether - # it is active and reconnect if not. - def verify! - if needs_verification? - reconnect! unless active? - @needs_verification = false - end - self - end - end - end - # The root class of all active record objects. class Base class ConnectionSpecification #:nodoc: @@ -102,8 +78,8 @@ module ActiveRecord ar_super = ActiveRecord::Base.superclass until klass == ar_super if conn = active_connections[klass.name] - # Validate the active connection before returning it. - conn.verify! + # Reconnect if the connection is inactive. + conn.reconnect! unless conn.active? return conn elsif conn = @@defined_connections[klass.name] # Activate this connection specification. @@ -152,10 +128,5 @@ module ActiveRecord establish_connection spec end end - - # Mark active connections for verification on next retrieve_connection. - def self.mark_active_connections_for_verification! #:nodoc: - active_connections.values.each { |conn| conn.needs_verification! } - end end end |