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 | |
| 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)
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 5 | ||||
| -rw-r--r-- | railties/guides/source/configuring.textile | 3 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
4 files changed, 8 insertions, 3 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 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 |