19513: Add Users.CreateRoleGroups config option.

[arvados.git] / services / api / config / initializers / legacy_jobs_api.rb

diff --git a/services/api/config/initializers/legacy_jobs_api.rb b/services/api/config/initializers/legacy_jobs_api.rb
index 2faf0dac4b6be6777b12b0990aaffb0605a5848a..b6a2895f78ccb2a2f0c09897a4a786bf326babbf 100644 (file)
--- a/services/api/config/initializers/legacy_jobs_api.rb
+++ b/services/api/config/initializers/legacy_jobs_api.rb
@@ -8,12 +8,13 @@
 
 require 'enable_jobs_api'
 
-Server::Application.configure do
+Rails.application.configure do
   begin
-    if ActiveRecord::Base.connection.tables.include?('jobs')
+    if ENV["ARVADOS_CONFIG"] != "none" && ActiveRecord::Base.connection.tables.include?('jobs')
       check_enable_legacy_jobs_api
     end
   rescue ActiveRecord::NoDatabaseError
-    # Database hasn't been created yet
+    # Since rails 5.2, all initializers are run by rake tasks (like db:create),
+    # see: https://github.com/rails/rails/issues/32870
   end
 end