Merge branch '12430-output-glob'

[arvados.git] / services / api / config / environment.rb

diff --git a/services/api/config/environment.rb b/services/api/config/environment.rb
index 4ccec85307319023b1649acdd6a05a217d473afa..cac5315775258a68f5e18885605d3fb1b758319e 100644 (file)
--- a/services/api/config/environment.rb
+++ b/services/api/config/environment.rb
@@ -1,12 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-require 'josh_id'
+# Load the Rails application.
+require_relative "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
+# Initialize the Rails application.
+Rails.application.initialize!