aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/mem_cache_store.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-01-03 16:39:50 -0500
committerArthur Neves <arthurnn@gmail.com>2014-01-03 16:39:50 -0500
commite7f56a7fe8fbb10e62a18b836c27aa1a0f7c5464 (patch)
treef48c4a899b1b669cfafd89ef3c2588f0a6b543f0 /activesupport/lib/active_support/cache/mem_cache_store.rb
parent98458eea425d15ebadf366d8b55fc89c1913d146 (diff)
downloadrails-e7f56a7fe8fbb10e62a18b836c27aa1a0f7c5464.tar.gz
rails-e7f56a7fe8fbb10e62a18b836c27aa1a0f7c5464.tar.bz2
rails-e7f56a7fe8fbb10e62a18b836c27aa1a0f7c5464.zip
Raise if MemCacheStore doenst receive a Dalli obj
:mem_cache_store should receive a list of hosts or a dalli client, otherwise raise it. Also adding a changelog.
Diffstat (limited to 'activesupport/lib/active_support/cache/mem_cache_store.rb')
-rw-r--r--activesupport/lib/active_support/cache/mem_cache_store.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 1ac4819d47..0eacc4c078 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -46,6 +46,9 @@ module ActiveSupport
options = addresses.extract_options!
super(options)
+ unless [String, Dalli::Client, NilClass].include?(addresses.first.class)
+ raise ArgumentError, "First argument must be an empty array, an array of hosts or a Dalli::Client instance."
+ end
if addresses.first.is_a?(Dalli::Client)
@data = addresses.first
else