X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/422afdbae3129f6ba37e3b9860fd02bd97f4dedc..c7ed8a9e8604b207e24e0899a811ff3cdb2e7c3f:/config/application.rb?ds=inline diff --git a/config/application.rb b/config/application.rb index 5139111cc..3b470bacc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,11 +1,13 @@ require_relative "boot" -require_relative "preinitializer" - -if STATUS == :database_offline +if ENV["OPENSTREETMAP_STATUS"] == "database_offline" + require "active_model/railtie" + require "active_job/railtie" + require "active_storage/engine" require "action_controller/railtie" require "action_mailer/railtie" - require "active_model/railtie" + require "action_view/railtie" + require "action_cable/engine" require "sprockets/railtie" require "rails/test_unit/railtie" else @@ -31,24 +33,24 @@ module OpenStreetMap # This defaults to true from rails 5.0 but our code doesn't comply # with it at all so we turn it off - config.active_record.belongs_to_required_by_default = false + config.active_record.belongs_to_required_by_default = false unless Settings.status == "database_offline" # 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 + config.active_record.schema_format = :sql unless Settings.status == "database_offline" # Don't eager load models when the database is offline - config.paths["app/models"].skip_eager_load! if STATUS == :database_offline + config.paths["app/models"].skip_eager_load! if Settings.status == "database_offline" # Use memcached for caching if required - config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS) + config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers) # Use logstash for logging if required - if defined?(LOGSTASH_PATH) + if Settings.key?(:logstash_path) config.logstasher.enabled = true config.logstasher.suppress_app_log = false - config.logstasher.logger_path = LOGSTASH_PATH + config.logstasher.logger_path = Settings.logstash_path config.logstasher.log_controller_parameters = true end end