Localisation updates from https://translatewiki.net.

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index bee36fa2ae72db8711ec202ab2ffe0a5085cf825..be2cc0a99bb5813ef68fb761f1a8b49e388d2d97 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,7 +31,7 @@ module OpenStreetMap
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    config.active_record.raise_in_transactional_callbacks = true unless STATUS == :database_offline
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
@@ -48,5 +48,16 @@ module OpenStreetMap
     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}/config/image_optim.yml")
   end
 end