X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96a00910d50931b139a1c00319b9fd46d863ca45..ede8cda2ef790ef36b025dda0dd8160f1dd19507:/config/initializers/session_store.rb?ds=sidebyside

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 8a0fd8f03..a12284855 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,9 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
-if defined?(MEMCACHE_SERVERS)
-  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"
+if Settings.key?(:memcache_servers)
+  Rails.application.config.session_store :mem_cache_store, :memcache_server => Settings.memcache_servers, :namespace => "rails:session", :key => "_osm_session"
 else
-  Rails.application.config.session_store :cookie_store, :key => "_osm_session"
+  Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new
 end