diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-05-21 19:02:48 -0700 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-05-21 19:02:48 -0700 |
| commit | e44009aa2bca8fc8f57c432d10e74aff84bbae29 (patch) | |
| tree | 8bf5d322000778e4d34de42c66077c2eb3ecf46c /activesupport/lib/active_support/cache/file_store.rb | |
| parent | edb87b19d42b2a47708a78e0762a9e761aaf1277 (diff) | |
| parent | b52c66f1bedb6ed5a08c106a199a53f67c9f6ec2 (diff) | |
| download | rails-e44009aa2bca8fc8f57c432d10e74aff84bbae29.tar.gz rails-e44009aa2bca8fc8f57c432d10e74aff84bbae29.tar.bz2 rails-e44009aa2bca8fc8f57c432d10e74aff84bbae29.zip | |
Merge pull request #5125 from winston/log_exception_when_cache_read_fails
#read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown
Diffstat (limited to 'activesupport/lib/active_support/cache/file_store.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache/file_store.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index 89bdb741d0..5be63af342 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -81,7 +81,8 @@ module ActiveSupport if File.exist?(file_name) File.open(file_name) { |f| Marshal.load(f) } end - rescue + rescue => e + logger.error("FileStoreError (#{e}): #{e.message}") if logger nil end |