kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Only create the defaults ApplicationSetting when DB is fully migrated

Browse source 
Return a fake application settings OpenStruct when this is not the case.
Also, use ActiveRecord::Base.connection_pool.active_connection? instead
of ActiveRecord::Base.connection.active? to avoid driver exception.
This commit is contained in:
Rémy Coutable 2016-01-28 10:14:21 +01:00
parent e6f3fe5d3b
commit 869b4d7c6a
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/gitlab/current_settings.rb
View file

@ -4,11 +4,14 @@ module Gitlab
key = :current_application_settings key = :current_application_settings
RequestStore.store[key] ||= begin RequestStore.store[key] ||= begin
settings = nil
if connect_to_db? if connect_to_db?
ApplicationSetting.current || ApplicationSetting.create_from_defaults settings = ApplicationSetting.current
else settings ||= ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
fake_application_settings
end end
settings || fake_application_settings
end end
end end
@ -18,35 +21,29 @@ module Gitlab
default_branch_protection: Settings.gitlab['default_branch_protection'], default_branch_protection: Settings.gitlab['default_branch_protection'],
signup_enabled: Settings.gitlab['signup_enabled'], signup_enabled: Settings.gitlab['signup_enabled'],
signin_enabled: Settings.gitlab['signin_enabled'], signin_enabled: Settings.gitlab['signin_enabled'],
twitter_sharing_enabled: Settings.gitlab['twitter_sharing_enabled'],
gravatar_enabled: Settings.gravatar['enabled'], gravatar_enabled: Settings.gravatar['enabled'],
sign_in_text: Settings.extra['sign_in_text'], sign_in_text: Settings.extra['sign_in_text'],
restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
max_attachment_size: Settings.gitlab['max_attachment_size'], max_attachment_size: Settings.gitlab['max_attachment_size'],
session_expire_delay: Settings.gitlab['session_expire_delay'], session_expire_delay: Settings.gitlab['session_expire_delay'],
import_sources: Settings.gitlab['import_sources'], default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'],
shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'], shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
max_artifacts_size: Settings.artifacts['max_size'], max_artifacts_size: Settings.artifacts['max_size'],
require_two_factor_authentication: false,
two_factor_grace_period: 48
) )
end end
private private
def connect_to_db? def connect_to_db?
use_db = if ENV['USE_DB'] == "false" ENV['USE_DB'] != 'false' &&
false ActiveRecord::Base.connection_pool.active_connection? &&
else ActiveRecord::Base.connection.table_exists?('application_settings')
true
end
use_db && ActiveRecord::Base.connected? &&
# The following condition is important: if a migrations adds a
# column to the application_settings table and a validation in
# the ApplicationSetting uses this new column we might end-up in
# a vicious circle where migration crash before being done.
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for
# a thorough explanation.
!ActiveRecord::Migrator.needs_migration? &&
ActiveRecord::Base.connection.table_exists?('application_settings')
rescue ActiveRecord::NoDatabaseError rescue ActiveRecord::NoDatabaseError
false false