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, 6 insertions, 1 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 81bf0c7dc4..c88baae616 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Setting config.assets.logger to false turn off Sprockets logger *Guillermo Iguaran*
+
 *   Add `config.action_dispatch.default_charset` to configure default charset for ActionDispatch::Response. *Carlos Antonio da Silva*
 
 *   Deprecate setting default charset at controller level, use the new `config.action_dispatch.default_charset` instead. *Carlos Antonio da Silva*
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 9f4151e4b3..44ddab0950 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -21,9 +21,12 @@ module Sprockets
       require 'sprockets'
 
       app.assets = Sprockets::Environment.new(app.root.to_s) do |env|
-        env.logger  = config.assets.logger || ::Rails.logger
         env.version = ::Rails.env + "-#{config.assets.version}"
 
+        if config.assets.logger != false
+          env.logger  = config.assets.logger || ::Rails.logger
+        end
+
         if config.assets.cache_store != false
           env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache
         end