projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18339-sweep-trash-lock'
[arvados.git]
/
services
/
api
/
config
/
environment.rb
diff --git
a/services/api/config/environment.rb
b/services/api/config/environment.rb
index d4b606dafcc7f6e7112b4591e16e82a6bbd08a2e..cd706940a389752fd6263bb32fc82a057fc3c583 100644
(file)
--- a/
services/api/config/environment.rb
+++ b/
services/api/config/environment.rb
@@
-3,14
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0
# Load the rails application
# SPDX-License-Identifier: AGPL-3.0
# Load the rails application
-require File.expand_path('../application', __FILE__)
-require 'josh_id'
+require_relative 'application'
# Initialize the rails application
# Initialize the rails application
-Server::Application.initialize!
-begin
- Rails.cache.clear
-rescue Errno::ENOENT => e
- # Cache directory does not exist? Then cache is clear, proceed.
- Rails.logger.warn "In Rails.cache.clear, ignoring #{e.inspect}"
-end
+Rails.application.initialize!