diff options
author | Sean McGivern <sean@gitlab.com> | 2019-04-04 09:16:37 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-04-04 09:16:37 +0000 |
commit | 42f6b0250d9c82546e7d911a058ff3edb3f5068c (patch) | |
tree | ade12f83ce00ea5b193ab75c7b802224290b4634 /app | |
parent | a6e9175fdd7790cc433ba49a85eaadbf75a3c8e9 (diff) | |
parent | a9c855f12c408651e1db41aa5e42aac33aac4084 (diff) | |
download | gitlab-ce-42f6b0250d9c82546e7d911a058ff3edb3f5068c.tar.gz |
Merge branch 'add_backtrace_to_kubernetes_log' into 'master'
Show backtrace when logging to kubernetes.log
Closes #56768
See merge request gitlab-org/gitlab-ce!25726
Diffstat (limited to 'app')
-rw-r--r-- | app/services/clusters/applications/base_helm_service.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb index c38b2656260..adaa68b1efb 100644 --- a/app/services/clusters/applications/base_helm_service.rb +++ b/app/services/clusters/applications/base_helm_service.rb @@ -13,16 +13,20 @@ module Clusters def log_error(error) meta = { - exception: error.class.name, error_code: error.respond_to?(:error_code) ? error.error_code : nil, service: self.class.name, app_id: app.id, project_ids: app.cluster.project_ids, - group_ids: app.cluster.group_ids, - message: error.message + group_ids: app.cluster.group_ids } - logger.error(meta) + logger_meta = meta.merge( + exception: error.class.name, + message: error.message, + backtrace: Gitlab::Profiler.clean_backtrace(error.backtrace) + ) + + logger.error(logger_meta) Gitlab::Sentry.track_acceptable_exception(error, extra: meta) end |