From 81c5242f43cb45d97b2a56409f8b39b0dba75ac3 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 19 Nov 2005 10:55:11 +0000 Subject: r3181@asus: jeremy | 2005-11-19 02:52:24 -0800 Mark connections for verification. Retrieve connection verifies before returning a connection. Verification tests whether the connection is marked then reconnects if the connection is inactive. All active connections are marked for verification after a request is handled. References #428. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3096 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../abstract/connection_specification.rb | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb') 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 a20304ea62..5e70930a85 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -1,4 +1,28 @@ 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: @@ -78,8 +102,11 @@ module ActiveRecord ar_super = ActiveRecord::Base.superclass until klass == ar_super if conn = active_connections[klass] + # Validate the active connection before returning it. + conn.verify! return conn elsif conn = @@defined_connections[klass] + # Activate this connection specification. klass.connection = conn return self.connection end @@ -125,5 +152,10 @@ 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 -- cgit v1.2.3