From 7ba28726150f5d4ee3b3cb676d6b73cc3b62e186 Mon Sep 17 00:00:00 2001 From: Nick Sieger Date: Thu, 4 Sep 2008 14:03:19 +0200 Subject: Deprecate verification_timeout and verify before reset Signed-off-by: Michael Koziarski --- .../connection_adapters/abstract/connection_pool.rb | 6 ++---- .../abstract/connection_specification.rb | 15 ++++++++++----- .../active_record/connection_adapters/abstract_adapter.rb | 12 ++++-------- 3 files changed, 16 insertions(+), 17 deletions(-) (limited to 'activerecord/lib') 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 838b0434b0..6b4bc2574d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -35,7 +35,6 @@ module ActiveRecord # * +wait_timeout+: number of seconds to block and wait for a connection # before giving up and raising a timeout error (default 5 seconds). class ConnectionPool - delegate :verification_timeout, :to => "::ActiveRecord::Base" attr_reader :spec def initialize(spec) @@ -60,7 +59,6 @@ module ActiveRecord # held in a hash keyed by the thread id. def connection if conn = @reserved_connections[current_connection_id] - conn.verify!(verification_timeout) conn else @reserved_connections[current_connection_id] = checkout @@ -118,7 +116,7 @@ module ActiveRecord def verify_active_connections! #:nodoc: clear_stale_cached_connections! @connections.each do |connection| - connection.verify!(verification_timeout) + connection.verify! end end @@ -200,8 +198,8 @@ module ActiveRecord end def checkout_and_verify(c) + c.verify! c.run_callbacks :checkout - c.verify!(verification_timeout) @checked_out << c c end 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 417a333aab..a968fc0fd3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -7,11 +7,6 @@ module ActiveRecord end end - # Check for activity after at least +verification_timeout+ seconds. - # Defaults to 0 (always check.) - cattr_accessor :verification_timeout, :instance_writer => false - @@verification_timeout = 0 - # The connection handler cattr_accessor :connection_handler, :instance_writer => false @@connection_handler = ConnectionAdapters::ConnectionHandler.new @@ -101,6 +96,16 @@ module ActiveRecord ActiveSupport::Deprecation.warn("ActiveRecord::Base.allow_concurrency= has been deprecated and no longer has any effect. Please remove all references to allow_concurrency=.") end + # Deprecated and no longer has any effect. + def verification_timeout + ActiveSupport::Deprecation.warn("ActiveRecord::Base.verification_timeout has been deprecated and no longer has any effect. Please remove all references to verification_timeout.") + end + + # Deprecated and no longer has any effect. + def verification_timeout=(flag) + ActiveSupport::Deprecation.warn("ActiveRecord::Base.verification_timeout= has been deprecated and no longer has any effect. Please remove all references to verification_timeout=.") + end + # Returns the connection currently associated with the class. This can # also be used to "borrow" the connection to do database work unrelated # to any of the specific Active Records. diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 005be9d72f..ad6e2171d1 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -123,14 +123,10 @@ module ActiveRecord false end - # Lazily verify this connection, calling active? only if it - # hasn't been called for +timeout+ seconds. - def verify!(timeout) - now = Time.now.to_i - if (now - @last_verification) > timeout - reconnect! unless active? - @last_verification = now - end + # Verify this connection by calling active? and reconnecting if + # the connection is no longer active. + def verify!(*ignored) + reconnect! unless active? end # Provides access to the underlying database connection. Useful for -- cgit v1.2.3