projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20858-jsonb-exists' refs #20858
[arvados.git]
/
services
/
api
/
config
/
environment.rb
diff --git
a/services/api/config/environment.rb
b/services/api/config/environment.rb
index 4ccec85307319023b1649acdd6a05a217d473afa..cd706940a389752fd6263bb32fc82a057fc3c583 100644
(file)
--- a/
services/api/config/environment.rb
+++ b/
services/api/config/environment.rb
@@
-1,12
+1,9
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
# Load the rails application
# 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!