diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 12:09:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 12:09:10 +0300 |
| commit | 315243f87739dd1edda2b75361f826abc91d4069 (patch) | |
| tree | f72b9e0c3e79e263687ea8d127a3e78bde9d8760 /config | |
| parent | 1c4f17276df2af5a6c205c2a3ceec907751edf68 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 43beae3f50d..19c5e4df854 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -31,9 +31,9 @@ Sidekiq.configure_server do |config| Sidekiq.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger - # Remove the default-provided handler + # Remove the default-provided handler. The exception is logged inside + # Gitlab::SidekiqLogging::StructuredLogger config.error_handlers.reject! { |handler| handler.is_a?(Sidekiq::ExceptionHandler::Logger) } - config.error_handlers << Gitlab::SidekiqLogging::ExceptionHandler.new end config.redis = queues_config_hash |