summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 10:28:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 10:28:37 +0000
commit662bb2b6f1f5b5730a0d1eaa66238e718468645d (patch)
treec1ca759e7d2c96e9c2023bbcf946f79e423473a5 /config
parented8af41027110fdad8f7bb4d53329eb73417fb8d (diff)
downloadgitlab-ce-662bb2b6f1f5b5730a0d1eaa66238e718468645d.tar.gz
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/initializers/lograge.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 769ef2af0e7..a8207862739 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -44,16 +44,7 @@ unless Sidekiq.server?
# https://github.com/roidrage/lograge#logging-errors--exceptions
exception = event.payload[:exception_object]
- if exception
- payload[:exception] = {
- class: exception.class.name,
- message: exception.message
- }
-
- if exception.backtrace
- payload[:exception][:backtrace] = Gitlab::Profiler.clean_backtrace(exception.backtrace)
- end
- end
+ ::Gitlab::ExceptionLogFormatter.format!(exception, payload)
payload
end