Commit 7f6a9245 authored by Stan Hu's avatar Stan Hu

Merge branch '5178-geo-verification-rename-log' into 'master'

Use geo.log for secondary repository verification logging

Closes #5178

See merge request gitlab-org/gitlab-ee!5095
parents c2cb9a3d 00d231c4
...@@ -6,8 +6,7 @@ module EE::Admin::LogsController ...@@ -6,8 +6,7 @@ module EE::Admin::LogsController
def loggers def loggers
strong_memoize(:loggers) do strong_memoize(:loggers) do
super + [ super + [
Gitlab::GeoLogger, Gitlab::GeoLogger
Gitlab::Geo::RepositoryVerificationLogger
] ]
end end
end end
......
module Geo module Geo
class RepositoryVerifySecondaryService class RepositoryVerifySecondaryService
include Gitlab::Geo::RepositoryVerificationLogHelpers include Gitlab::Geo::ProjectLogHelpers
delegate :project, to: :registry delegate :project, to: :registry
...@@ -66,7 +66,7 @@ module Geo ...@@ -66,7 +66,7 @@ module Geo
} }
if failure if failure
log_error(failure, exception, type: type, repository_path: repository_path, full_path: path_to_repo) log_error(failure, exception, type: type, repository_full_path: path_to_repo)
end end
registry.update!(attrs) registry.update!(attrs)
......
---
title: Geo secondary repository verification messages now appear in geo.log
merge_request: 5095
author:
type: fixed
module Gitlab
module Geo
module RepositoryVerificationLogHelpers
include ProjectLogHelpers
protected
def geo_logger
Gitlab::Geo::RepositoryVerificationLogger
end
end
end
end
module Gitlab
module Geo
class RepositoryVerificationLogger < ::Gitlab::Geo::Logger
def self.file_name_noext
'geo_repository_verification'
end
end
end
end
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