diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-08-07 19:09:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-07 19:09:47 +0200 |
commit | b35afddb1433753d13270d1043370c4b29c8f846 (patch) | |
tree | 6c3abb3ce64dde0be561de237bcd21f8a6a987d1 /actionpack/lib | |
parent | 15a600f9fe815ad6423875b69cd439a41e9636eb (diff) | |
parent | ab2af4dfcb61b568a9753b97dc55f1b45e3a824e (diff) | |
download | rails-b35afddb1433753d13270d1043370c4b29c8f846.tar.gz rails-b35afddb1433753d13270d1043370c4b29c8f846.tar.bz2 rails-b35afddb1433753d13270d1043370c4b29c8f846.zip |
Merge pull request #25825 from st0012/partial-cache
Better logging of cached partial renders
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/abstract_controller/caching.rb | 3 | ||||
-rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/caching.rb b/actionpack/lib/abstract_controller/caching.rb index a37ee9ec97..d222880922 100644 --- a/actionpack/lib/abstract_controller/caching.rb +++ b/actionpack/lib/abstract_controller/caching.rb @@ -34,6 +34,9 @@ module AbstractController config_accessor :perform_caching self.perform_caching = true if perform_caching.nil? + config_accessor :enable_fragment_cache_logging + self.enable_fragment_cache_logging = false + class_attribute :_view_cache_dependencies self._view_cache_dependencies = [] helper_method :view_cache_dependencies if respond_to?(:helper_method) diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index a0917b4fdb..739a11679b 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -59,14 +59,13 @@ module ActionController expire_fragment expire_page write_page).each do |method| class_eval <<-METHOD, __FILE__, __LINE__ + 1 def #{method}(event) - return unless logger.info? + return unless logger.info? && ActionController::Base.enable_fragment_cache_logging key_or_path = event.payload[:key] || event.payload[:path] human_name = #{method.to_s.humanize.inspect} info("\#{human_name} \#{key_or_path} (\#{event.duration.round(1)}ms)") end METHOD end - def logger ActionController::Base.logger end |