diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-11 11:20:20 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-11 11:20:20 -0800 |
commit | fffbf9bd067f3cfdccae583447de48585d69008c (patch) | |
tree | 52707dc7658858224f4145895879ee15ef9dbc59 /actionview | |
parent | 6fedc7d56a580d1ef7e923d95865bd99626d2f21 (diff) | |
download | rails-fffbf9bd067f3cfdccae583447de48585d69008c.tar.gz rails-fffbf9bd067f3cfdccae583447de48585d69008c.tar.bz2 rails-fffbf9bd067f3cfdccae583447de48585d69008c.zip |
make the logger method always return something
then we can stop scattering nil checks (e.g. `try`) through the class.
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/digestor.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 6f2f9ca53c..1c66c2c2cd 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -64,17 +64,17 @@ module ActionView def digest Digest::MD5.hexdigest("#{source}-#{dependency_digest}").tap do |digest| - logger.try :debug, " Cache digest for #{template.inspect}: #{digest}" + logger.debug " Cache digest for #{template.inspect}: #{digest}" end rescue ActionView::MissingTemplate - logger.try :error, " Couldn't find template for digesting: #{name}" + logger.error " Couldn't find template for digesting: #{name}" '' end def dependencies DependencyTracker.find_dependencies(name, template, finder.view_paths) rescue ActionView::MissingTemplate - logger.try :error, " '#{name}' file doesn't exist, so no dependencies" + logger.error " '#{name}' file doesn't exist, so no dependencies" [] end @@ -86,8 +86,13 @@ module ActionView end private + class NullLogger + def self.debug(_); end + def self.error(_); end + end + def logger - ActionView::Base.logger + ActionView::Base.logger || NullLogger end def logical_name |