aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-06-15 21:05:00 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-08-28 10:51:05 +0200
commit9b0ac0bc74569db460f87ea6888b3847be0ff5be (patch)
treed4575361cd7580fb734688d0d60f6219fc11fc73 /actionpack
parent45efb665f0dc10cd6f8e186b06765693fda6251b (diff)
downloadrails-9b0ac0bc74569db460f87ea6888b3847be0ff5be.tar.gz
rails-9b0ac0bc74569db460f87ea6888b3847be0ff5be.tar.bz2
rails-9b0ac0bc74569db460f87ea6888b3847be0ff5be.zip
Use ActionView::Base.logger instead of AC::Base.logger
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/renderer/streaming_template_renderer.rb2
-rw-r--r--actionpack/test/controller/new_base/render_streaming_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index f46aabd2be..9cf6eb0c65 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -30,7 +30,7 @@ module ActionView
# This is the same logging logic as in ShowExceptions middleware.
# TODO Once "exceptron" is in, refactor this piece to simply re-use exceptron.
def log_error(exception) #:nodoc:
- logger = ActionController::Base.logger
+ logger = ActionView::Base.logger
return unless logger
message = "\n#{exception.class} (#{exception.message}):\n"
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index bfca8c5c24..f4bdd3e1d4 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -85,7 +85,7 @@ module RenderStreaming
test "rendering with template exception logs the exception" do
io = StringIO.new
- _old, ActionController::Base.logger = ActionController::Base.logger, ActiveSupport::Logger.new(io)
+ _old, ActionView::Base.logger = ActionView::Base.logger, ActiveSupport::Logger.new(io)
begin
get "/render_streaming/basic/template_exception"