From 72f25df06581e799b085a5864c789dac80cf002e Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 18 Feb 2021 11:50:36 -0500 Subject: [PATCH] database_connectivity? should handle not-running database To reproduce, disable your local postgres instance and run `bundle exec rake test:verify_no_db_access_loading_rails_environment` Follow up to 76731ae9 --- lib/tasks/test.rake | 1 + lib/vmdb/settings/database_source.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index 282ad5c324a..cf363002478 100644 --- 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 index 6facade6e01..a6ba7b14e82 100644 --- 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