diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /lib/gitlab/sidekiq_logging | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
| download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
| -rw-r--r-- | lib/gitlab/sidekiq_logging/deduplication_logger.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_logging/deduplication_logger.rb b/lib/gitlab/sidekiq_logging/deduplication_logger.rb index 01810e474dc..c5654819ffb 100644 --- a/lib/gitlab/sidekiq_logging/deduplication_logger.rb +++ b/lib/gitlab/sidekiq_logging/deduplication_logger.rb @@ -6,11 +6,14 @@ module Gitlab include Singleton include LogsJobs - def log(job, deduplication_type) + def log(job, deduplication_type, deduplication_options = {}) payload = parse_job(job) payload['job_status'] = 'deduplicated' payload['message'] = "#{base_message(payload)}: deduplicated: #{deduplication_type}" - payload['deduplication_type'] = deduplication_type + payload['deduplication.type'] = deduplication_type + # removing nil values from deduplication options + payload.merge!( + deduplication_options.compact.transform_keys { |k| "deduplication.options.#{k}" }) Sidekiq.logger.info payload end |