Merge remote-tracking branch 'upstream/pull/1704'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 02dd1d2b296867520fcdc7c0f521d2c1e025ab1a..9ba122dafb8b1518af4930f92ceec945befff7ec 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,9 +34,7 @@ module OpenStreetMap
     config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
 
     # Use memcached for caching if required
-    if defined?(MEMCACHE_SERVERS)
-      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
-    end
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)
 
     # Use logstash for logging if required
     if defined?(LOGSTASH_PATH)