Use Gitlab::ProjectAccess to look up for an error message

parent ba0277c5
...@@ -16,12 +16,13 @@ module Geo ...@@ -16,12 +16,13 @@ module Geo
rescue Gitlab::Shell::Error, Gitlab::Git::BaseError => e rescue Gitlab::Shell::Error, Gitlab::Git::BaseError => e
# In some cases repository does not exist, the only way to know about this is to parse the error text. # In some cases repository does not exist, the only way to know about this is to parse the error text.
# If it does not exist we should consider it as successfully downloaded. # If it does not exist we should consider it as successfully downloaded.
if e.message.include? Gitlab::GitAccessDesign::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock if e.message.include? Gitlab::GitAccessDesign.error_message(:no_repo)
log_info('Design repository is not found, marking it as successfully synced') log_info('Design repository is not found, marking it as successfully synced')
mark_sync_as_successful(missing_on_primary: true) mark_sync_as_successful(missing_on_primary: true)
else else
fail_registry_sync!('Error syncing design repository', e) fail_registry_sync!('Error syncing design repository', e)
end end
ensure ensure
expire_repository_caches expire_repository_caches
end end
......
...@@ -19,7 +19,7 @@ module Geo ...@@ -19,7 +19,7 @@ module Geo
project.repository.after_create project.repository.after_create
rescue Gitlab::Shell::Error, Gitlab::Git::BaseError => e rescue Gitlab::Shell::Error, Gitlab::Git::BaseError => e
# In some cases repository does not exist, the only way to know about this is to parse the error text. # In some cases repository does not exist, the only way to know about this is to parse the error text.
if e.message.include? Gitlab::GitAccess::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock if e.message.include?(Gitlab::GitAccessProject.error_message(:no_repo))
if repository_presumably_exists_on_primary? if repository_presumably_exists_on_primary?
log_info('Repository is not found, but it seems to exist on the primary') log_info('Repository is not found, but it seems to exist on the primary')
fail_registry_sync!('Repository is not found', e) fail_registry_sync!('Repository is not found', e)
...@@ -30,6 +30,7 @@ module Geo ...@@ -30,6 +30,7 @@ module Geo
else else
fail_registry_sync!('Error syncing repository', e) fail_registry_sync!('Error syncing repository', e)
end end
ensure ensure
expire_repository_caches expire_repository_caches
execute_housekeeping execute_housekeeping
......
...@@ -16,7 +16,7 @@ module Geo ...@@ -16,7 +16,7 @@ module Geo
rescue Gitlab::Shell::Error, Gitlab::Git::BaseError, Wiki::CouldNotCreateWikiError => e rescue Gitlab::Shell::Error, Gitlab::Git::BaseError, Wiki::CouldNotCreateWikiError => e
# In some cases repository does not exist, the only way to know about this is to parse the error text. # In some cases repository does not exist, the only way to know about this is to parse the error text.
# If it does not exist we should consider it as successfully downloaded. # If it does not exist we should consider it as successfully downloaded.
if e.message.include? Gitlab::GitAccessWiki::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock if e.message.include?(Gitlab::GitAccessWiki.error_message(:no_repo))
if repository_presumably_exists_on_primary? if repository_presumably_exists_on_primary?
log_info('Wiki is not found, but it seems to exist on the primary') log_info('Wiki is not found, but it seems to exist on the primary')
fail_registry_sync!('Wiki is not found', e) fail_registry_sync!('Wiki is not found', e)
...@@ -27,6 +27,7 @@ module Geo ...@@ -27,6 +27,7 @@ module Geo
else else
fail_registry_sync!('Error syncing wiki repository', e) fail_registry_sync!('Error syncing wiki repository', e)
end end
ensure ensure
expire_repository_caches expire_repository_caches
end end
......
...@@ -47,6 +47,16 @@ module Gitlab ...@@ -47,6 +47,16 @@ module Gitlab
:cmd, :changes :cmd, :changes
attr_accessor :container attr_accessor :container
def self.error_message(key)
self.ancestors.each do |cls|
return cls.const_get('ERROR_MESSAGES', false).fetch(key)
rescue NameError, KeyError
next
end
raise ArgumentError, "No error message defined for #{key}"
end
def initialize(actor, container, protocol, authentication_abilities:, namespace_path: nil, repository_path: nil, redirected_path: nil, auth_result_type: nil) def initialize(actor, container, protocol, authentication_abilities:, namespace_path: nil, repository_path: nil, redirected_path: nil, auth_result_type: nil)
@actor = actor @actor = actor
@container = container @container = container
...@@ -413,13 +423,7 @@ module Gitlab ...@@ -413,13 +423,7 @@ module Gitlab
protected protected
def error_message(key) def error_message(key)
self.class.ancestors.each do |cls| self.class.error_message(key)
return cls.const_get('ERROR_MESSAGES', false).fetch(key)
rescue NameError, KeyError
next
end
raise ArgumentError, "No error message defined for #{key}"
end end
def success_result def success_result
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment