Merge pull request #4518 from guilleiguaran/silent-sprockets-logger-3-2-stable

Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)

2 files changed, 2 insertions, 2 deletions

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index 9a6f40b9e6..2488f86450 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -156,8 +156,7 @@ Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets wit
 
 * +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production.
 
-* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+.
-
+* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+. Setting +config.assets.logger+ to false will turn off served assets logging.
 
 h4. Configuring Generators
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a782441a21..38c9bd7070 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -57,6 +57,7 @@ module Rails
         @assets.js_compressor            = nil
         @assets.css_compressor           = nil
         @assets.initialize_on_precompile = true
+        @assets.logger                   = nil
       end
 
       def compiled_asset_path