Switch to use v4.0 of the Facebook API for authentication

[rails.git] / config / initializers / session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 1430b00164270d1617f908d14a2aebb422ba8e24..a122848553bf1a9f00fe4d09f2f18ee292617f3b 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Be sure to restart your server when you modify this file.
 

-if defined?(MEMCACHE_SERVERS)
-  OpenStreetMap::Application.config.session_store :mem_cache_store, :memcache_servers => MEMCACHE_SERVERS, :namespace => "rails:session", :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
 else

-  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'
+  Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new

 end
 end