Merge pull request #4875 from consul/unify_environments

Simplify staging/preproduction environment files

config/environments/preproduction.rb

@@ -1,89 +1 @@
-Rails.application.configure do
- # Settings specified here will take precedence over those in config/application.rb.
-
- # Code is not reloaded between requests.
- config.cache_classes = true
-
- # Eager load code on boot. This eager loads most of Rails and
- # your application in memory, allowing both threaded web servers
- # and those relying on copy on write to perform better.
- # Rake tasks automatically ignore this option for performance.
- config.eager_load = true
-
- # Because autoloading is disabled in production environments with Rails 5,
- # using autoload_paths will not load needed classes from specified paths.
- # The solution to this, is to ask Rails to eager load classes.
- config.eager_load_paths += ["#{config.root}/lib"]
-
- # Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
- config.action_controller.perform_caching = true
-
- # Enable Rack::Cache to put a simple HTTP cache in front of your application
- # Add `rack-cache` to your Gemfile before enabling this.
- # For large-scale production use, consider using a caching reverse proxy like
- # NGINX, varnish or squid.
- # config.action_dispatch.rack_cache = true
-
- # Disable serving static files from the `/public` folder by default since
- # Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
-
- # Compress JavaScripts and CSS.
- config.assets.js_compressor = Uglifier.new(harmony: true)
- # config.assets.css_compressor = :sass
-
- # Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
-
- # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
- # Specifies the header that your server uses for sending files.
- # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
- # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
-
- # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # Configure force_ssl in secrets.yml
- config.force_ssl = Rails.application.secrets.force_ssl
-
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
- config.log_level = :debug
-
- # Prepend all log lines with the following tags.
- # config.log_tags = [ :subdomain, :uuid ]
-
- # Use a different logger for distributed setups.
- # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
- # Use a different cache store in production.
- config.cache_store = :mem_cache_store
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = "http:https://assets.example.com"
-
- # Ignore bad email addresses and do not raise email delivery errors.
- # Set this to true and configure the email server for immediate delivery to raise delivery errors.
- config.action_mailer.raise_delivery_errors = true
- config.action_mailer.default_url_options = { host: Rails.application.secrets.server_name }
- config.action_mailer.asset_host = "https://#{Rails.application.secrets.server_name}"
-
- # Configure your SMTP service credentials in secrets.yml
- if Rails.application.secrets.smtp_settings
- config.action_mailer.delivery_method = Rails.application.secrets.mailer_delivery_method || :smtp
- config.action_mailer.smtp_settings = Rails.application.secrets.smtp_settings
- end
-
- # Disable locale fallbacks for I18n
- # (prevents using fallback locales set in application.rb).
- # config.i18n.fallbacks = false
-
- # Send deprecation notices to registered listeners.
- config.active_support.deprecation = :notify
-
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
- # Do not dump schema after migrations.
- config.active_record.dump_schema_after_migration = false
-end
+require Rails.root.join("config", "environments", "staging")

config/environments/production.rb

@@ -30,19 +30,17 @@
  # Do not fallback to assets pipeline if a precompiled asset is missed.
  config.assets.compile = false
 
- # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http:https://assets.example.com'
+ # config.action_controller.asset_host = "http:https://assets.example.com"
 
  # Specifies the header that your server uses for sending files.
  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
  # Mount Action Cable outside main process or domain
  # config.action_cable.mount_path = nil
- # config.action_cable.url = 'wss:https://example.com/cable'
- # config.action_cable.allowed_request_origins = [ 'http:https://example.com', /http:\/\/example.*/ ]
+ # config.action_cable.url = "wss:https://example.com/cable"
+ # config.action_cable.allowed_request_origins = [ "http:https://example.com", /http:\/\/example.*/ ]
 
  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
  # Configure force_ssl in secrets.yml
@@ -86,8 +84,8 @@
  config.log_formatter = ::Logger::Formatter.new
 
  # Use a different logger for distributed setups.
- # require 'syslog/logger'
- # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+ # require "syslog/logger"
+ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
  if ENV["RAILS_LOG_TO_STDOUT"].present?
  logger = ActiveSupport::Logger.new(STDOUT)

config/environments/staging.rb

@@ -19,12 +19,6 @@
  config.consider_all_requests_local = false
  config.action_controller.perform_caching = true
 
- # Enable Rack::Cache to put a simple HTTP cache in front of your application
- # Add `rack-cache` to your Gemfile before enabling this.
- # For large-scale production use, consider using a caching reverse proxy like
- # NGINX, varnish or squid.
- # config.action_dispatch.rack_cache = true
-
  # Disable serving static files from the `/public` folder by default since
  # Apache or NGINX already handles this.
  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
@@ -36,12 +30,18 @@
  # Do not fallback to assets pipeline if a precompiled asset is missed.
  config.assets.compile = false
 
- # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+ # config.action_controller.asset_host = "http:https://assets.example.com"
 
  # Specifies the header that your server uses for sending files.
  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
+ # Mount Action Cable outside main process or domain
+ # config.action_cable.mount_path = nil
+ # config.action_cable.url = "wss:https://example.com/cable"
+ # config.action_cable.allowed_request_origins = [ "http:https://example.com", /http:\/\/example.*/ ]
+
  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
  # Configure force_ssl in secrets.yml
  config.force_ssl = Rails.application.secrets.force_ssl
@@ -51,16 +51,15 @@
  config.log_level = :debug
 
  # Prepend all log lines with the following tags.
- # config.log_tags = [ :subdomain, :uuid ]
-
- # Use a different logger for distributed setups.
- # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+ config.log_tags = [:request_id]
 
  # Use a different cache store in production.
  config.cache_store = :mem_cache_store
 
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = "http:https://assets.example.com"
+ # Use a real queuing backend for Active Job (and separate queues per environment)
+ # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_name_prefix = "consul_#{Rails.env}"
+ config.action_mailer.perform_caching = false
 
  # Ignore bad email addresses and do not raise email delivery errors.
  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -84,6 +83,16 @@
  # Use default logging formatter so that PID and timestamp are not suppressed.
  config.log_formatter = ::Logger::Formatter.new
 
+ # Use a different logger for distributed setups.
+ # require "syslog/logger"
+ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
+
+ if ENV["RAILS_LOG_TO_STDOUT"].present?
+ logger = ActiveSupport::Logger.new(STDOUT)
+ logger.formatter = config.log_formatter
+ config.logger = ActiveSupport::TaggedLogging.new(logger)
+ end
+
  # Do not dump schema after migrations.
  config.active_record.dump_schema_after_migration = false
 end