Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 72f2da7c5ff792c3aa4b8010b3bbe49c8cda8769..17173d536612fdbba32887b1d766a651e3ffee45 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,35 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 if defined?(MEMCACHE_SERVERS)
-  unless STATUS == :database_offline or STATUS == :database_readonly
-    module Rack
-      module Session
-        class Memcache
-          def get_session(env, sid)
-            with_lock(env, [nil, {}]) do
-              unless sid and session = @pool.get(sid)
-                if sid and s = ActiveRecord::SessionStore::SqlBypass.find_by_session_id(sid)
-                  session = s.data
-                  s.destroy
-                else
-                  sid, session = generate_sid, {}
-                end
-                
-                unless /^STORED/ =~ @pool.add(sid, session)
-                  raise "Session collision on '#{sid.inspect}'"
-                end
-              end
-              [sid, session]
-            end
-          end
-        end
-      end
-    end
-  end
-
-  cache = MemCache.new(:namespace => "rails:session", :string_return_types => true)
-
-  OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session"
+  OpenStreetMap::Application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session"
 else
-  OpenStreetMap::Application.config.session_store :cookie_store, :key => '_osm_session'
+  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'
 end