Make sure custom settings are picked up by tests

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 096b7573ac1d53471fddb555b3edbe8af46feae5..3b470bacc5fc2759da6258fc3dd3badaffc26775 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,36 +1,6 @@
 require_relative "boot"
 
 require_relative "boot"
 

-# Guard against deployments with old-style application.yml configurations
-# Otherwise, admins might not be aware that they are now silently ignored
-# and major problems could occur
-# rubocop:disable Rails/Output, Rails/Exit
-if File.exist?(File.expand_path("application.yml", __dir__))
-  puts "The config/application.yml file is no longer supported"
-  puts "Default settings are now found in config/settings.yml and you can override these in config/settings.local.yml"
-  puts "To prevent unexpected behaviour, please copy any custom settings to config/settings.local.yml"
-  puts " and then remove your config/application.yml file."
-  exit!
-end
-# rubocop:enable Rails/Output, Rails/Exit
-
-# Set the STATUS constant from the environment, if it matches a recognized value
-ALLOWED_STATUS = [
-  :online,            # online and operating normally
-  :api_readonly,      # site online but API in read-only mode
-  :api_offline,       # site online but API offline
-  :database_readonly, # database and site in read-only mode
-  :database_offline,  # database offline with site in emergency mode
-  :gpx_offline        # gpx storage offline
-].freeze
-
-status = if ENV["STATUS"] && ALLOWED_STATUS.include?(ENV["STATUS"].to_sym)
-           ENV["STATUS"].to_sym
-         else
-           :online
-         end
-Object.const_set("STATUS", status)
-
-if STATUS == :database_offline
+if ENV["OPENSTREETMAP_STATUS"] == "database_offline"

   require "active_model/railtie"
   require "active_job/railtie"
   require "active_storage/engine"
   require "active_model/railtie"
   require "active_job/railtie"
   require "active_storage/engine"


@@ -63,15 +33,15 @@ 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
 
     # 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 unless STATUS == :database_offline
+    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
 
     # 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
 
     # 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, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
 
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)