5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
25 lines
884 B
Ruby
25 lines
884 B
Ruby
# Be sure to restart your server when you modify this file.
|
|
|
|
require 'gitlab/current_settings'
|
|
|
|
if Rails.env.production?
|
|
# 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
|
|
Raven.configure do |config|
|
|
config.dsn = Gitlab::CurrentSettings.current_application_settings.sentry_dsn
|
|
config.release = Gitlab::REVISION
|
|
|
|
# Sanitize fields based on those sanitized from Rails.
|
|
config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
|
|
# Sanitize authentication headers
|
|
config.sanitize_http_headers = %w[Authorization Private-Token]
|
|
config.tags = { program: Gitlab::Sentry.program_context }
|
|
end
|
|
end
|
|
end
|