diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 03:06:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 03:06:23 +0300 |
| commit | 41aba3c68d1ab3b450f1b33027c57258ff88f28e (patch) | |
| tree | e1ee61d4a069ad4f7ded56565de5775bc8f0fc30 /lib/gitlab/import_export/shared.rb | |
| parent | 430999251558db3c64b4adfc6e2b4fb771f6cd48 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export/shared.rb')
| -rw-r--r-- | lib/gitlab/import_export/shared.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/shared.rb b/lib/gitlab/import_export/shared.rb index 9144a4406cd..02d46a1f498 100644 --- a/lib/gitlab/import_export/shared.rb +++ b/lib/gitlab/import_export/shared.rb @@ -56,8 +56,9 @@ module Gitlab end def error(error) - log_error(message: error.message, caller: caller[0].dup) - log_debug(backtrace: error.backtrace&.join("\n")) + error_payload = { message: error.message } + error_payload[:error_backtrace] = Gitlab::Profiler.clean_backtrace(error.backtrace) if error.backtrace + log_error(error_payload) Gitlab::Sentry.track_acceptable_exception(error, extra: log_base_data) |