Merge branch 'master' into openstreetbugs

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb295b83f17285331882dfdc0eebddaecf32f773..3b664b8219fd7a069e2275c68ffc583d2e4e9ff1 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,15 +4,33 @@
 # Code is not reloaded between requests
 config.cache_classes = true
 
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
+
+# See everything in the log (default is :info)
+# config.log_level = :debug
+
+# Use a different log path in production
+if defined?(LOG_PATH)
+  config.log_path = LOG_PATH
+end
+
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
+
+# 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
+end
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
+# config.action_controller.asset_host = "http://assets.example.com"
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+# Enable threaded mode
+# config.threadsafe!