diff options
| author | Roger Meier <r.meier@siemens.com> | 2019-04-30 22:06:08 +0200 |
|---|---|---|
| committer | Roger Meier <r.meier@siemens.com> | 2019-06-25 21:17:19 +0200 |
| commit | 946ffc67b711b39512a789213779d2736fcc0049 (patch) | |
| tree | 661cfd4c18767c9972ca7775e7c8e4d1f1586544 /config | |
| parent | 76889a9956e76e300edc8993048c3cd5c3a24da0 (diff) | |
| download | gitlab-ce-946ffc67b711b39512a789213779d2736fcc0049.tar.gz | |
refactor: remove Sentry from application settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sentry.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index e5589ce0ad1..fcc6bfa5c92 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -3,18 +3,11 @@ require 'gitlab/current_settings' def configure_sentry - # allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done - begin - sentry_enabled = Gitlab::CurrentSettings.current_application_settings.sentry_enabled - rescue - sentry_enabled = false - end - - if sentry_enabled + if Gitlab::Sentry.enabled? Raven.configure do |config| - config.dsn = Gitlab::CurrentSettings.current_application_settings.sentry_dsn + config.dsn = Gitlab.config.sentry.dsn config.release = Gitlab.revision - config.current_environment = Gitlab.config.sentry.environment.presence + config.current_environment = Gitlab.config.sentry.environment # Sanitize fields based on those sanitized from Rails. config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) |