Adjust rubocop threshold

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 48317ec2b8da312dd0f5c7090776b0579300a556..5ff166beb1ab86812c100eb18d6d376534e857da 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -48,5 +48,16 @@ module OpenStreetMap
     if defined?(MEMCACHE_SERVERS)
       config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
     end
     if defined?(MEMCACHE_SERVERS)
       config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
     end

+
+    # Use logstash for logging if required
+    if defined?(LOGSTASH_PATH)
+      config.logstasher.enabled = true
+      config.logstasher.suppress_app_log = false
+      config.logstasher.logger_path = LOGSTASH_PATH
+      config.logstasher.log_controller_parameters = true
+    end
+
+    # Configure image optimisation
+    config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml"))

   end
 end
   end
 end