From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2012 09:04:56 +0000 (+0100)
Subject: Removed temporary code for promoting databases sessions to memcached
X-Git-Tag: live~5617
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5cae983622386b7d4f75afef6128086606a99dd3

Removed temporary code for promoting databases sessions to memcached
---

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 02548e803..aa9071404 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,32 +1,6 @@
 # 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"