Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db?

This ensures that rake tasks that don't need a DB connection can be run without one.

Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db?
55ab92c0 · Rémy Coutable · 869b4d7c · 55ab92c0
Commit 55ab92c0 authored Jan 28, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

current_settings.rb lib/gitlab/current_settings.rb +4 -1

No files found.
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -41,8 +41,11 @@ module Gitlab
    private

    def connect_to_db?
+      # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
+      active_db_connection = ActiveRecord::Base.connection.active? rescue false
+
      ENV['USE_DB'] != 'false' &&
-      ActiveRecord::Base.connection_pool.active_connection? &&
+      active_db_connection &&
      ActiveRecord::Base.connection.table_exists?('application_settings')

    rescue ActiveRecord::NoDatabaseError