aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/caching.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index d04979644b..9ca0fa53df 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -485,6 +485,7 @@ module ActionController #:nodoc:
end
end
+ begin
require_library_or_gem 'memcache'
class MemCacheStore < MemoryStore #:nodoc:
attr_reader :addresses
@@ -497,6 +498,9 @@ module ActionController #:nodoc:
@data = MemCache.new(*addresses)
end
end
+ rescue LoadError
+ # MemCache wasn't available so neither can the store be
+ end
class UnthreadedFileStore #:nodoc:
attr_reader :cache_path