diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-18 05:20:20 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-18 05:20:20 -0800 |
| commit | f74afd973dd41dd081978025b96332a5b5cc39b0 (patch) | |
| tree | b5c6df9d71e5be0cdc6ae4c0d508b9d7ed2eb5a2 /actionpack/lib/sprockets/railtie.rb | |
| parent | 2f52bd308244b3f6e23ccb7c9a6336529fa9852a (diff) | |
| parent | ae7037eba06f248e19dec4bf9583a873d9b6ae22 (diff) | |
| download | rails-f74afd973dd41dd081978025b96332a5b5cc39b0.tar.gz rails-f74afd973dd41dd081978025b96332a5b5cc39b0.tar.bz2 rails-f74afd973dd41dd081978025b96332a5b5cc39b0.zip | |
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)
Diffstat (limited to 'actionpack/lib/sprockets/railtie.rb')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |