diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-08 10:25:13 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-08 10:25:13 -0700 |
| commit | ab5aa55cb86424286f65b273105a3602bbd77258 (patch) | |
| tree | 1238e882b8989795329ce201779b15776d06daf4 /activesupport/lib/active_support | |
| parent | 3957d44fd10c683518562f22d8b73f1b1c3d455d (diff) | |
| parent | 2c27e3d336df0600581c01b794d90cd09efd6b09 (diff) | |
| download | rails-ab5aa55cb86424286f65b273105a3602bbd77258.tar.gz rails-ab5aa55cb86424286f65b273105a3602bbd77258.tar.bz2 rails-ab5aa55cb86424286f65b273105a3602bbd77258.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index d84a62ca2d..c56fedc12e 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -64,7 +64,7 @@ module ActiveSupport @data.get(key, raw?(options)) end rescue MemCache::MemCacheError => e - logger.error("MemCacheError (#{e}): #{e.message}") + logger.error("MemCacheError (#{e}): #{e.message}") if logger nil end @@ -85,7 +85,7 @@ module ActiveSupport response == Response::STORED end rescue MemCache::MemCacheError => e - logger.error("MemCacheError (#{e}): #{e.message}") + logger.error("MemCacheError (#{e}): #{e.message}") if logger false end @@ -95,7 +95,7 @@ module ActiveSupport response == Response::DELETED end rescue MemCache::MemCacheError => e - logger.error("MemCacheError (#{e}): #{e.message}") + logger.error("MemCacheError (#{e}): #{e.message}") if logger false end |