Remove 9 year old warning

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 652721e21d9de6388c12a53a0449ca91c67c9ad7..be2cc0a99bb5813ef68fb761f1a8b49e388d2d97 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)

 
 

-require File.expand_path('../preinitializer', __FILE__)
+require File.expand_path("../preinitializer", __FILE__)

 
 if STATUS == :database_offline
   require "action_controller/railtie"
 
 if STATUS == :database_offline
   require "action_controller/railtie"


@@ -9,7 +9,7 @@ if STATUS == :database_offline
   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else
   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else

-  require 'rails/all'
+  require "rails/all"

 end
 
 # Require the gems listed in Gemfile, including any gems
 end
 
 # Require the gems listed in Gemfile, including any gems


@@ -31,7 +31,7 @@ module OpenStreetMap
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     # 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)
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)


@@ -39,13 +39,25 @@ module OpenStreetMap
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types

-    unless STATUS == :database_offline
-      config.active_record.schema_format = :sql
-    end
+    config.active_record.schema_format = :sql unless STATUS == :database_offline

 
     # Don't eager load models when the database is offline
 
     # Don't eager load models when the database is offline

-    if STATUS == :database_offline
-      config.paths["app/models"].skip_eager_load!
+    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
+
+    # Use memcached for caching if required
+    if defined?(MEMCACHE_SERVERS)
+      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }

     end
     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
   end
 end