diff options
| author | Aliaksey Kandratsenka <alk@tut.by> | 2008-10-02 22:59:03 +0300 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-10-04 17:48:13 +0200 |
| commit | 6080b73b1cf6c9ff969b81751a1e5d26d7633a32 (patch) | |
| tree | 20ce3433da390db10f9dacb6ea2d63a1c5d4d4a9 /actionpack/lib/action_controller/integration.rb | |
| parent | 834361145a805b5077f962dc2e67a0a9ea882535 (diff) | |
| download | rails-6080b73b1cf6c9ff969b81751a1e5d26d7633a32.tar.gz rails-6080b73b1cf6c9ff969b81751a1e5d26d7633a32.tar.bz2 rails-6080b73b1cf6c9ff969b81751a1e5d26d7633a32.zip | |
call clear_active_connections! in :after_dispatch to give pooled connections back
This fixes connection pool exhaustion for web servers which create new thread per connection (e.g. Webrick).
integration.rb changes are required to keep test transaction active for several requests.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1171 state:committed]
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index a98c1af7f9..fc473c269c 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -276,7 +276,7 @@ module ActionController ActionController::Base.clear_last_instantiation! env['rack.input'] = data.is_a?(IO) ? data : StringIO.new(data || '') - @status, @headers, result_body = ActionController::Dispatcher.new.call(env) + @status, @headers, result_body = ActionController::Dispatcher.new.mark_as_test_request!.call(env) @request_count += 1 @controller = ActionController::Base.last_instantiation |