From e3ad8d93d47816426042089f26867185c7014605 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Thu, 1 Aug 2013 15:06:56 -0700 Subject: [PATCH] fix for production config --- config/environments/production.rb | 2 +- config/initializers/z_dalli.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index b43b98c66..2f6eb96a5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -40,7 +40,7 @@ Danbooru::Application.configure do # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) # Use a different cache store in production - config.cache_store = :dalli_store, Danbooru.config.memcached_servers + # config.cache_store = :dalli_store, Danbooru.config.memcached_servers # Enable serving of images, stylesheets, and JavaScripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" diff --git a/config/initializers/z_dalli.rb b/config/initializers/z_dalli.rb index 8f3152cd6..5ccaf4cdc 100644 --- a/config/initializers/z_dalli.rb +++ b/config/initializers/z_dalli.rb @@ -1,3 +1,9 @@ unless defined?(MEMCACHE) MEMCACHE = Dalli::Client.new(Danbooru.config.memcached_servers, :namespace => Danbooru.config.app_name.gsub(/[^A-Za-z0-9]/, "_")) end + +if Rails.env.production? + Danbooru::Application.configure do + config.cache_store = :dalli_store, Danbooru.config.memcached_servers + end +end