Merge branch 'database-fix-setting' into 'master'

Check for database connection when running current_application_settings The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown. See merge request !292

Merge branch 'database-fix-setting' into 'master'
465f4167 · Marin Jankovski · 2fba3189 · 02d8575a · 465f4167
Commit 465f4167 authored Jan 19, 2015 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 19 deletions

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

No files found.
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
 module Gitlab
  module CurrentSettings
    def current_application_settings
-      begin
-        if ActiveRecord::Base.connection.table_exists?('application_settings')
-          ApplicationSetting.current ||
-            ApplicationSetting.create_from_defaults
-        else
-          fake_application_settings
-        end
-      rescue ActiveRecord::NoDatabaseError, database_adapter.constantize::Error
+      if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings')
+        ApplicationSetting.current ||
+          ApplicationSetting.create_from_defaults
+      else
        fake_application_settings
      end
    end
@@ -22,16 +18,5 @@ module Gitlab
        sign_in_text: Settings.extra['sign_in_text'],
      )
    end
-
-    # We need to check which database is setup
-    # but we cannot assume that the database exists already.
-    # Not checking this will break "rake gitlab:setup".
-    def database_adapter
-      if Rails.configuration.database_configuration[Rails.env]['adapter'] == 'mysql2'
-        "Mysql2"
-      else
-        "PG"
-      end
-    end
  end
 end