From 8f5e733998c2f06b63e72072c152546f2074c08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 17 Jan 2010 11:29:41 +0100 Subject: [PATCH] Add notifications to default middleware stack and update subscriber tests. --- railties/lib/rails/configuration.rb | 1 + railties/lib/rails/subscriber.rb | 2 +- railties/test/application/middleware_test.rb | 1 + railties/test/application/notifications_test.rb | 2 +- railties/test/subscriber_test.rb | 6 +++--- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index a597a01d72..72bebe085d 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -14,6 +14,7 @@ module Rails middleware.use('::Rack::Lock', :if => lambda { !ActionController::Base.allow_concurrency }) middleware.use('::Rack::Runtime') middleware.use('ActionDispatch::ShowExceptions', lambda { ActionController::Base.consider_all_requests_local }) + middleware.use('ActionDispatch::Notifications') middleware.use('ActionDispatch::Callbacks', lambda { ActionController::Dispatcher.prepare_each_request }) middleware.use('ActionDispatch::Cookies') middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options }) diff --git a/railties/lib/rails/subscriber.rb b/railties/lib/rails/subscriber.rb index e8d13babf0..2674bf003e 100644 --- a/railties/lib/rails/subscriber.rb +++ b/railties/lib/rails/subscriber.rb @@ -66,7 +66,7 @@ module Rails subscriber.send(name, ActiveSupport::Notifications::Event.new(*args)) end - if args[0] == "action_dispatch.callback" && !subscribers.empty? + if args[0] == "action_dispatch.after_dispatch" && !subscribers.empty? flush_all! log_tailer.tail! if log_tailer end diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index f2bfeb79fe..1c5cc62ecd 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -18,6 +18,7 @@ module ApplicationTests "Rack::Lock", "Rack::Runtime", "ActionDispatch::ShowExceptions", + "ActionDispatch::Notifications", "ActionDispatch::Callbacks", "ActionDispatch::Cookies", "ActionDispatch::Session::CookieStore", diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb index 1eb0777db8..db8605edbe 100644 --- a/railties/test/application/notifications_test.rb +++ b/railties/test/application/notifications_test.rb @@ -64,7 +64,7 @@ module ApplicationTests ActiveRecord::Base.logger = logger = MockLogger.new - # Mimic an ActiveRecord notifications + # Mimic ActiveRecord notifications instrument "active_record.sql", :name => "SQL", :sql => "SHOW tables" wait diff --git a/railties/test/subscriber_test.rb b/railties/test/subscriber_test.rb index ac34939510..fa3f7bfabb 100644 --- a/railties/test/subscriber_test.rb +++ b/railties/test/subscriber_test.rb @@ -92,7 +92,7 @@ module SubscriberTest def test_flushes_loggers_when_action_dispatch_callback_is_received Rails::Subscriber.add :my_subscriber, @subscriber - instrument "action_dispatch.callback" + instrument "action_dispatch.after_dispatch" wait assert_equal 1, @logger.flush_count end @@ -100,7 +100,7 @@ module SubscriberTest def test_flushes_the_same_logger_just_once Rails::Subscriber.add :my_subscriber, @subscriber Rails::Subscriber.add :another, @subscriber - instrument "action_dispatch.callback" + instrument "action_dispatch.after_dispatch" wait assert_equal 1, @logger.flush_count end @@ -111,7 +111,7 @@ module SubscriberTest Rails::Subscriber.log_tailer = log_tailer Rails::Subscriber.add :my_subscriber, @subscriber - instrument "action_dispatch.callback" + instrument "action_dispatch.after_dispatch" wait ensure Rails::Subscriber.log_tailer = nil