From 02e4d7ffd4b96d13efd0c5ebba703606fc2e6414 Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Tue, 17 Jan 2012 22:05:56 -0500 Subject: [PATCH 1/2] Silent Sprockets logger when config.assets.logger is set to false --- actionpack/lib/sprockets/railtie.rb | 5 ++++- railties/lib/rails/application/configuration.rb | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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/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 From ae7037eba06f248e19dec4bf9583a873d9b6ae22 Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Wed, 18 Jan 2012 08:06:48 -0500 Subject: [PATCH 2/2] Update CHANGELOG and docs for config.assets.logger --- actionpack/CHANGELOG.md | 2 ++ railties/guides/source/configuring.textile | 3 +-- 2 files changed, 3 insertions(+), 2 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/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