Unify production and staging environment files

We changed the structure of the production environment file in commit
eb36b7e, but forgot to do so for staging and preproduction.

We're also changing the comments in the production environment file so
they use double quotes, like we do everywhere else.

After these changes, the staging and production environments are mostly
identical, and we could simply require the production environment
configuration in the `staging.rb` file. We aren't doing so because we've
just done changes affecting the preproduction environment and, since
Consul installations might have customized these files, it might be hard
for them to deal with all these changes at once.

config/environments/production.rb

@@ -31,16 +31,16 @@
  config.assets.compile = false
 
  # 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
@@ -84,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,10 +30,18 @@
  # Do not fallback to assets pipeline if a precompiled asset is missed.
  config.assets.compile = false
 
+ # 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
@@ -49,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.
@@ -82,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