Merge pull request #21064 from Fryguy/fix_database_source2

database_connectivity? should handle not-running database
ManageIQ · Feb 18, 2021 · 3dd17ba · 3dd17ba
2 parents d5be234 + 72f25df
commit 3dd17ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
@@ -12,6 +12,7 @@ namespace :test do
     ENV['VERBOSE'] ||= "false"
   end
 
+  desc "Verifies that the rails environment does not require DB access"
   task :verify_no_db_access_loading_rails_environment do
     if Rake::Task['environment'].already_invoked
       raise "Failed to verify database access when loading rails because the 'environment' rake task has already been invoked!"

diff --git a/lib/vmdb/settings/database_source.rb b/lib/vmdb/settings/database_source.rb
@@ -77,7 +77,7 @@ def resource_queryable?
 
       def database_connectivity?
         ActiveRecord::Base.connection && ActiveRecord::Base.connected?
-      rescue ActiveRecord::NoDatabaseError
+      rescue ActiveRecord::NoDatabaseError, PG::ConnectionBad
         false
       end
     end