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
f84b2bef
Commit
f84b2bef
authored
6 years ago
by
Stan Hu
Committed by
Yorick Peterse
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix load balancing configuration not working with Geo tracking database
parent
32a8aa93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
ee/app/models/geo/tracking_base.rb
ee/app/models/geo/tracking_base.rb
+2
-1
ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml
ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml
+5
-0
No files found.
ee/app/models/geo/tracking_base.rb
View file @
f84b2bef
...
@@ -15,7 +15,8 @@ module Geo
...
@@ -15,7 +15,8 @@ module Geo
raise
SecondaryNotConfigured
.
new
(
'Geo secondary database is not configured'
)
raise
SecondaryNotConfigured
.
new
(
'Geo secondary database is not configured'
)
end
end
super
# Don't call super because LoadBalancing::ActiveRecordProxy will intercept it
retrieve_connection
end
end
end
end
end
end
This diff is collapsed.
Click to expand it.
ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml
0 → 100644
View file @
f84b2bef
---
title
:
Geo
:
Fix load balancing configuration not working with Geo tracking database
merge_request
:
6178
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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