aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-03-01 22:08:00 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-03-01 22:08:00 +0000
commit2b02596b964302ecbc38cb39bf820af6e32ee95e (patch)
tree83efb5a3aa220e996c9261500838442c21e1f22c /railties/lib
parent7568f18a2ac0813e0def5685bc272666b172a9dc (diff)
downloadrails-2b02596b964302ecbc38cb39bf820af6e32ee95e.tar.gz
rails-2b02596b964302ecbc38cb39bf820af6e32ee95e.tar.bz2
rails-2b02596b964302ecbc38cb39bf820af6e32ee95e.zip
Clear stale, cached connections left behind by defunct threads. Eliminate duplicate connection cache.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 2b4caff392..d4f644ecc9 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -67,13 +67,12 @@ class Dispatcher
ActionController::Routing::Routes.reload if Dependencies.load?
prepare_breakpoint
require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
- ActiveRecord::Base.verify_connection_cache!
+ ActiveRecord::Base.verify_active_connections!
end
-
+
def reset_after_dispatch
reset_application! if Dependencies.load?
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
- # ActiveRecord::Base.clear_connection_cache!
end
def prepare_breakpoint