Merge branch 'master' into moderation

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 6a96b9dd6115b87c733f477285f0ee3185ef9242..02dd1d2b296867520fcdc7c0f521d2c1e025ab1a 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,15 +1,15 @@
-require File.expand_path('../boot', __FILE__)
+require_relative "boot"

 
 

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

 
 if STATUS == :database_offline
 
 if STATUS == :database_offline

-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_model/railtie"
-require "sprockets/railtie"
-require "rails/test_unit/railtie"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "active_model/railtie"
+  require "sprockets/railtie"
+  require "rails/test_unit/railtie"

 else
 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


@@ -22,30 +22,31 @@ module OpenStreetMap
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 

-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-

     # Custom directories with classes and modules you want to be autoloadable.
     # Custom directories with classes and modules you want to be autoloadable.

-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]

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

+
+    # Configure image optimisation
+    config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml"))

   end
 end
   end
 end