Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a0c9e3c0
Commit
a0c9e3c0
authored
Mar 01, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add config for Geo node status requests timeout
parent
361b8f04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
app/services/geo/node_status_service.rb
app/services/geo/node_status_service.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+5
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+6
-1
No files found.
app/services/geo/node_status_service.rb
View file @
a0c9e3c0
...
...
@@ -3,7 +3,7 @@ module Geo
include
HTTParty
# HTTParty timeout
default_timeout
Gitlab
.
config
.
gitlab
.
webhook
_timeout
default_timeout
Gitlab
.
config
.
gitlab
.
geo_status
_timeout
def
call
(
status_url
)
response
=
self
.
class
.
get
(
status_url
,
...
...
config/gitlab.yml.example
View file @
a0c9e3c0
...
...
@@ -102,6 +102,11 @@ production: &base
# The default is 'shared/cache/archive/' relative to the root of the Rails app.
# 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
# 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
...
...
config/initializers/1_settings.rb
View file @
a0c9e3c0
...
...
@@ -109,7 +109,7 @@ class Settings < Settingslogic
def
base_url
(
config
)
custom_port
=
on_standard_port?
(
config
)
?
nil
:
":
#{
config
.
port
}
"
[
config
.
protocol
,
"://"
,
...
...
@@ -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_https'
]
||=
false
if
Settings
.
pages
[
'external_https'
].
nil?
#
# Geo
#
Settings
.
gitlab
[
'geo_status_timeout'
]
||=
10
#
# Git LFS
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment