diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 21:54:40 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-06 20:46:14 +0100 |
| commit | 39c1731a53d1014eab7c876d70632b1abf738712 (patch) | |
| tree | 5d51a48a32a92fdedf7b907a32caa172d1c0d923 /app/helpers | |
| parent | cfe484795d4ddb8c7b3247802547e3da74c64cf2 (diff) | |
| download | gitlab-ce-39c1731a53d1014eab7c876d70632b1abf738712.tar.gz | |
Log and pass correlation-id between Unicorn, Sidekiq and Gitaly
The Correlation ID is taken or generated from received X-Request-ID.
Then it is being passed to all executed services (sidekiq workers
or gitaly calls).
The Correlation ID is logged in all structured logs as `correlation_id`.
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/icons_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/sentry_helper.rb | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index b0f63de2fb8..4e11772b252 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -42,7 +42,7 @@ module IconsHelper end def sprite_icon(icon_name, size: nil, css_class: nil) - if Gitlab::Sentry.should_raise? + if Gitlab::Sentry.should_raise_for_dev? unless known_sprites.include?(icon_name) exception = ArgumentError.new("#{icon_name} is not a known icon in @gitlab-org/gitlab-svg") raise exception diff --git a/app/helpers/sentry_helper.rb b/app/helpers/sentry_helper.rb deleted file mode 100644 index d53eaef9952..00000000000 --- a/app/helpers/sentry_helper.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -module SentryHelper - def sentry_enabled? - Gitlab::Sentry.enabled? - end - - def sentry_context - Gitlab::Sentry.context(current_user) - end -end |