aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-06 09:50:58 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-06 09:50:58 -0800
commit017b0fb08a221fe6b1bb73946c3e365daf80bb39 (patch)
tree7d17f57dbfe83906d53692f7d8fbe29e7cf1620b
parentca98d0d48694288c46f684010c412a876abeca85 (diff)
parentf3748c886a609938549fb5bf6bbe7e3d12529952 (diff)
downloadrails-017b0fb08a221fe6b1bb73946c3e365daf80bb39.tar.gz
rails-017b0fb08a221fe6b1bb73946c3e365daf80bb39.tar.bz2
rails-017b0fb08a221fe6b1bb73946c3e365daf80bb39.zip
Merge pull request #13617 from arthurnn/error_var
Add 'e' var on rescue DalliError, in order to log it
-rw-r--r--activesupport/lib/active_support/cache/mem_cache_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 0eacc4c078..61b4f0b8b0 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -85,7 +85,7 @@ module ActiveSupport
instrument(:increment, name, :amount => amount) do
@data.incr(escape_key(namespaced_key(name, options)), amount)
end
- rescue Dalli::DalliError
+ rescue Dalli::DalliError => e
logger.error("DalliError (#{e}): #{e.message}") if logger
nil
end
@@ -99,7 +99,7 @@ module ActiveSupport
instrument(:decrement, name, :amount => amount) do
@data.decr(escape_key(namespaced_key(name, options)), amount)
end
- rescue Dalli::DalliError
+ rescue Dalli::DalliError => e
logger.error("DalliError (#{e}): #{e.message}") if logger
nil
end