X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/93fded964161e190eda2ff220c2b2229e10d92da..007e1b26cd293686ab6236750db41bd5fb1cf5a1:/config/initializers/session_store.rb?ds=sidebyside

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index a9afad2d6..a12284855 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
-if STATUS == :database_offline or STATUS == :database_readonly
-  OpenStreetMap::Application.config.session_store :cookie_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
-  ActiveRecord::SessionStore.session_class = ActiveRecord::SessionStore::SqlBypass
-  OpenStreetMap::Application.config.session_store :active_record_store, :key => '_osm_session'
+  Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new
 end