correctly handle transforming settings into useful datastructure

This commit is contained in:
Pawel Chojnacki 2017-07-04 00:46:44 +02:00
parent c1b043bdb7
commit de6c3597ab
2 changed files with 5 additions and 2 deletions

View File

@ -13,7 +13,11 @@ module RequiresWhitelistedMonitoringClient
def client_ip_whitelisted?
Settings.monitoring.ip_whitelist.any? { |e| e.include?(Gitlab::RequestContext.client_ip) }
end
def ip_whitelist
@ip_whitelist ||= Settings.monitoring.ip_whitelist.map(&IPAddr.method(:new))
end
def token_valid?
token = params[:token].presence || request.headers['TOKEN']
token.present? &&

View File

@ -499,7 +499,6 @@ Settings.webpack.dev_server['port'] ||= 3808
#
Settings['monitoring'] ||= Settingslogic.new({})
Settings.monitoring['ip_whitelist'] ||= %w{127.0.0.1/8}
Settings.monitoring.ip_whitelist.map!(&IPAddr.method(:new))
#
# Prometheus metrics settings