X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c00d9e1595d07e6941bb2fbfb8b4e57c3c4ba856..94a62edb315ec297a02fb6c9a2016bcaa17fac9b:/services/api/config/application.rb

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index f211ec9e0c..b28ae0e071 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require "rails"
 # Pick only the frameworks we need:
@@ -12,10 +12,11 @@ require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
-# Skip ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
-# require "action_cable/engine"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
+# Skipping the following:
+# * ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
+# * ActiveStorage (new in Rails 5.1)
 
 require 'digest'
 
@@ -40,6 +41,10 @@ if defined?(Bundler)
   end
 end
 
+if ENV["ARVADOS_RAILS_LOG_TO_STDOUT"]
+  Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+end
+
 module Server
   class Application < Rails::Application
     # The following is to avoid SafeYAML's warning message