aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-29 17:02:29 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-29 17:02:29 -0500
commite646385993668a3b54c21c7f60b032cd842f3790 (patch)
tree01b0a7ef26362b27cd6bfff58c67896f2b28738b
parentbed7a1acc46c9b211b7feaa21cc10395283392ab (diff)
downloadrails-e646385993668a3b54c21c7f60b032cd842f3790.tar.gz
rails-e646385993668a3b54c21c7f60b032cd842f3790.tar.bz2
rails-e646385993668a3b54c21c7f60b032cd842f3790.zip
Fix sprockets logger
-rw-r--r--railties/lib/rails/engine.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 04676a42dd..82ce4c8cbb 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -463,7 +463,6 @@ module Rails
require 'sprockets'
env = Sprockets::Environment.new(root.to_s)
- # env.logger = Rails.logger
env.static_root = root.join("public")
self.class.default_sprockets_paths.each do |pattern|
@@ -572,6 +571,10 @@ module Rails
# consistently executed after all the initializers above across all engines.
end
+ initializer "sprockets.logger" do
+ assets.logger = Rails.logger
+ end
+
rake_tasks do
next if self.is_a?(Rails::Application)