From: Tom Hughes <tom@compton.nu>
Date: Mon, 4 Dec 2017 21:19:38 +0000 (+0000)
Subject: Use a memory cache for sessions when memcache is not configured
X-Git-Tag: live~3255
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fd33ff83f3389b25051bbb6a9ff4dcce3c34683c?ds=sidebyside

Use a memory cache for sessions when memcache is not configured

Fixes #1695
---

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 8a0fd8f03..a9c735d62 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,8 +2,6 @@
 
 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"
 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