projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16312-s3-signature-v4'
[arvados.git]
/
services
/
api
/
config
/
application.rb
diff --git
a/services/api/config/application.rb
b/services/api/config/application.rb
index 9a4270ad9df4384d88c97cf100ae83790a1a35ba..b6174a0d8989f36e2e851431b18fe1627a33dbb8 100644
(file)
--- a/
services/api/config/application.rb
+++ b/
services/api/config/application.rb
@@
-40,6
+40,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
@@
-76,6
+80,11
@@
module Server
config.action_dispatch.perform_deep_munge = false
config.action_dispatch.perform_deep_munge = false
+ # force_ssl's redirect-to-https feature doesn't work when the
+ # client supplies a port number, and prevents arvados-controller
+ # from connecting to Rails internally via plain http.
+ config.ssl_options = {redirect: false}
+
I18n.enforce_available_locales = false
# Before using the filesystem backend for Rails.cache, check
I18n.enforce_available_locales = false
# Before using the filesystem backend for Rails.cache, check