From 662bb2b6f1f5b5730a0d1eaa66238e718468645d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 3 Dec 2019 10:28:37 +0000
Subject: Add latest changes from gitlab-org/gitlab@12-5-stable-ee

---
 config/initializers/lograge.rb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3