Merge pull request #7552 from guilleiguaran/dalli-session-store

Use Dalli for memcache session store

2 files changed, 7 insertions, 12 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
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 03234612ab..e53ce4195b 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -34,9 +34,9 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
   end
 
   begin
-    require 'memcache'
-    memcache = MemCache.new('localhost:11211')
-    memcache.set('ping', '')
+    require 'dalli'
+    ss = Dalli::Client.new('localhost:11211').stats
+    raise Dalli::DalliError unless ss['localhost:11211']
 
     def test_setting_and_getting_session_value
       with_test_route_set do
@@ -131,11 +131,6 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
           get '/get_session_id'
           assert_response :success
         end
-        with_autoload_path "session_autoload_test" do
-          get '/get_session_value'
-          assert_response :success
-          assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class"
-        end
       end
     end
 
@@ -165,7 +160,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_not_equal session_id, cookies['_session_id']
       end
     end
-  rescue LoadError, RuntimeError
+  rescue LoadError, RuntimeError, Dalli::DalliError
     $stderr.puts "Skipping MemCacheStoreTest tests. Start memcached and try again."
   end