Merge remote-tracking branch 'upstream/pull/1880'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index d257696fe6ad170e6018ed2f82c35401ad083a41..b6e2ba46788c14d6342e934f31a0364b9e83c43c 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,16 +1,21 @@
-require File.expand_path('../boot', __FILE__)
-
-require File.expand_path('../preinitializer', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+require_relative "boot"
+
+require_relative "preinitializer"
+
+if STATUS == :database_offline
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "active_model/railtie"
+  require "sprockets/railtie"
+  require "rails/test_unit/railtie"
+else
+  require "rails/all"
 end
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
 module OpenStreetMap
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
@@ -18,38 +23,25 @@ module OpenStreetMap
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    config.active_record.observers = :spam_observer
-
-    # 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)'
+    config.autoload_paths += %W[#{config.root}/lib]
 
-    # 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
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation]
+    # 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
+    config.active_record.schema_format = :sql unless STATUS == :database_offline
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
+    # Don't eager load models when the database is offline
+    config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
 
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Use memcached for caching if required
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)
 
-    # Use SQL instead of Active Record's schema dumper when creating the test 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
-    config.active_record.schema_format = :sql
+    # 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
 end