diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 18:13:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 18:13:41 +0300 |
| commit | f50cb4f63fae6f02a0b8d9c3a95f29b3b4f79516 (patch) | |
| tree | b6bcddc7b76089f91cc6143d141440cb63adfcbd /lib/gitlab/sidekiq_logging | |
| parent | 0a559c913e4d333f339fcc03b89bfeade9ca0b93 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
| -rw-r--r-- | lib/gitlab/sidekiq_logging/json_formatter.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_logging/json_formatter.rb b/lib/gitlab/sidekiq_logging/json_formatter.rb index 8894b48417c..d22f0851927 100644 --- a/lib/gitlab/sidekiq_logging/json_formatter.rb +++ b/lib/gitlab/sidekiq_logging/json_formatter.rb @@ -2,6 +2,7 @@ # This is needed for sidekiq-cluster require 'json' +require 'sidekiq/job_retry' module Gitlab module SidekiqLogging diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index 3438bc0f3ef..a9bfcce2e0a 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -2,6 +2,8 @@ require 'active_record' require 'active_record/log_subscriber' +require 'sidekiq/job_logger' +require 'sidekiq/job_retry' module Gitlab module SidekiqLogging |