diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-07 06:52:06 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-07 06:52:06 -0700 |
| commit | 35a8920cdd4ca1b353aa7c677c21567a31f3f4a7 (patch) | |
| tree | 93c548ae26cc1f084fade64c8cbebe5048451344 /actionpack/lib | |
| parent | c5ac6da5c213d61acc8a3552cf58a224be92ba53 (diff) | |
| parent | f6f406696f01f000f1b873780648222fefe8bfce (diff) | |
| download | rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.tar.gz rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.tar.bz2 rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.zip | |
Merge pull request #7552 from guilleiguaran/dalli-session-store
Use Dalli for memcache session store
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb index 38a737cd2b..14af7eef68 100644 --- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb @@ -1,15 +1,15 @@ require 'action_dispatch/middleware/session/abstract_store' -require 'rack/session/memcache' +require 'rack/session/dalli' module ActionDispatch module Session - class MemCacheStore < Rack::Session::Memcache + class MemCacheStore < Rack::Session::Dalli include Compatibility include StaleSessionCheck include SessionObject def initialize(app, options = {}) - require 'memcache' + require 'dalli' options[:expire_after] ||= options[:expires] super end |