Handle missing DBs in connect_to_db?

This ensures CurrentSettings#connect_to_db? returns "false" in the event of a database not existing, instead of raising an error.

Handle missing DBs in connect_to_db?
8d7a968d · Yorick Peterse · 61561a9e · 8d7a968d
Commit 8d7a968d authored Jan 08, 2016 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

current_settings.rb lib/gitlab/current_settings.rb +3 -0

No files found.
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -41,6 +41,9 @@ module Gitlab
      use_db && ActiveRecord::Base.connection.active? &&
                !ActiveRecord::Migrator.needs_migration? &&
                ActiveRecord::Base.connection.table_exists?('application_settings')
+
+    rescue ActiveRecord::NoDatabaseError
+      false
    end
  end
 end