Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-07-24 15:09:32 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-07-24 15:09:32 +0300
commitf296f23500b4b3758670ae0c5ce2e1779f533e8b (patch)
tree717151cb9e81d489b4ecf880988ea10d77b7224f /lib
parentfd7c75bf603f4f2f1a4a4e63ef5cbc1a51cc0a15 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/sidekiq_logging/logs_jobs.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_logging/logs_jobs.rb b/lib/gitlab/sidekiq_logging/logs_jobs.rb
index 3e6e6e05e95..edf2cffa0c9 100644
--- a/lib/gitlab/sidekiq_logging/logs_jobs.rb
+++ b/lib/gitlab/sidekiq_logging/logs_jobs.rb
@@ -12,7 +12,8 @@ module Gitlab
# Error information from the previous try is in the payload for
# displaying in the Sidekiq UI, but is very confusing in logs!
job = job.except(
- 'exception.backtrace', 'exception.class', 'exception.message', 'exception.sql'
+ 'exception.backtrace', 'exception.class', 'exception.message', 'exception.sql',
+ 'error_message', 'error_class', 'error_backtrace', 'failed_at'
)
job['class'] = job.delete('wrapped') if job['wrapped'].present?