X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cae983622386b7d4f75afef6128086606a99dd3..96a00910d50931b139a1c00319b9fd46d863ca45:/config/initializers/session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index aa9071404..8a0fd8f03 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,9 +1,9 @@
 # Be sure to restart your server when you modify this file.
 
 if defined?(MEMCACHE_SERVERS)
-  cache = MemCache.new(:namespace => "rails:session", :string_return_types => true)
-
-  OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session"
+  Rails.application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session"
+elsif Rails.application.config.cache_store != :null_store
+  Rails.application.config.session_store :cache_store, :key => "_osm_session"
 else
-  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'
+  Rails.application.config.session_store :cookie_store, :key => "_osm_session"
 end