projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17090: Use EXCLUSIVE lock for permission updates
[arvados.git]
/
services
/
api
/
config
/
application.rb
diff --git
a/services/api/config/application.rb
b/services/api/config/application.rb
index f211ec9e0cde5c67160bda1bde97e20cdb7861a8..b28ae0e0718e2ddabc472f61be8cf8c07a53232f 100644
(file)
--- a/
services/api/config/application.rb
+++ b/
services/api/config/application.rb
@@
-2,7
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-require
File.expand_path('../boot', __FILE__)
+require
_relative 'boot'
require "rails"
# Pick only the frameworks we need:
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"
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"
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'
require 'digest'
@@
-40,6
+41,10
@@
if defined?(Bundler)
end
end
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
module Server
class Application < Rails::Application
# The following is to avoid SafeYAML's warning message