X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b08270526a34723f1bb9f68a1f0878838714b15..d102c9aaf478a4bad52a72b1b72470ba35ba464e:/config/application.rb diff --git a/config/application.rb b/config/application.rb index 5139111cc..f05c6fa62 100644 --- a/config/application.rb +++ b/config/application.rb @@ -42,13 +42,13 @@ module OpenStreetMap config.paths["app/models"].skip_eager_load! if STATUS == :database_offline # Use memcached for caching if required - config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS) + config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers) # Use logstash for logging if required - if defined?(LOGSTASH_PATH) + if Settings.key?(:logstash_path) config.logstasher.enabled = true config.logstasher.suppress_app_log = false - config.logstasher.logger_path = LOGSTASH_PATH + config.logstasher.logger_path = Settings.logstash_path config.logstasher.log_controller_parameters = true end end