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.
22 lines
527 B
Ruby
22 lines
527 B
Ruby
module Gitlab
|
|
class PollingInterval
|
|
extend Gitlab::CurrentSettings
|
|
|
|
HEADER_NAME = 'Poll-Interval'.freeze
|
|
|
|
def self.set_header(response, interval:)
|
|
if polling_enabled?
|
|
multiplier = current_application_settings.polling_interval_multiplier
|
|
value = (interval * multiplier).to_i
|
|
else
|
|
value = -1
|
|
end
|
|
|
|
response.headers[HEADER_NAME] = value.to_s
|
|
end
|
|
|
|
def self.polling_enabled?
|
|
!current_application_settings.polling_interval_multiplier.zero?
|
|
end
|
|
end
|
|
end
|