Add config for Geo node status requests timeout

parent 361b8f04
...@@ -3,7 +3,7 @@ module Geo ...@@ -3,7 +3,7 @@ module Geo
include HTTParty include HTTParty
# HTTParty timeout # HTTParty timeout
default_timeout Gitlab.config.gitlab.webhook_timeout default_timeout Gitlab.config.gitlab.geo_status_timeout
def call(status_url) def call(status_url)
response = self.class.get(status_url, response = self.class.get(status_url,
......
...@@ -102,6 +102,11 @@ production: &base ...@@ -102,6 +102,11 @@ production: &base
# The default is 'shared/cache/archive/' relative to the root of the Rails app. # The default is 'shared/cache/archive/' relative to the root of the Rails app.
# repository_downloads_path: shared/cache/archive/ # repository_downloads_path: shared/cache/archive/
## Geo settings
# NOTE: This will only take effect if Geo is enabled
# Number of seconds to wait for HTTP response after sending status HTTP GET request to secondary nodes (default: 10)
# geo_status_timeout: 10
## Reply by email ## Reply by email
# Allow users to comment on issues and merge requests by replying to notification emails. # Allow users to comment on issues and merge requests by replying to notification emails.
# For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
......
...@@ -330,6 +330,11 @@ Settings.pages['url'] ||= Settings.send(:build_pages_url) ...@@ -330,6 +330,11 @@ Settings.pages['url'] ||= Settings.send(:build_pages_url)
Settings.pages['external_http'] ||= false if Settings.pages['external_http'].nil? Settings.pages['external_http'] ||= false if Settings.pages['external_http'].nil?
Settings.pages['external_https'] ||= false if Settings.pages['external_https'].nil? Settings.pages['external_https'] ||= false if Settings.pages['external_https'].nil?
#
# Geo
#
Settings.gitlab['geo_status_timeout'] ||= 10
# #
# Git LFS # Git LFS
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment