Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

database_connectivity? should handle not-running database #21064

Merged
merged 1 commit into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/tasks/test.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion lib/vmdb/settings/database_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down