Merge branch 'master' into openstreetbugs

[rails.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 95b45339ccdc4fffd9fec60d3c7cdc56f72dfa02..56c33ec98398d160f952639c76e8437c806b6e70 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -49,8 +49,7 @@ OpenStreetMap::Application.configure do
 
   # Use a different cache store in production
   if defined?(MEMCACHE_SERVERS)
-    MEMCACHE = Memcached::Rails.new(MEMCACHE_SERVERS, :binary_protocol => true)
-    config.cache_store = :mem_cache_store, MEMCACHE
+    config.cache_store = :mem_cache_store, MemCache.new(:namespace => "rails:cache", :no_block => true, :buffer_requests => true, :noreply => true)
   end
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server