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
9deaf60d
Commit
9deaf60d
authored
Jun 13, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more descriptive message about NotImplementedError and display it in health check
parent
de431bbc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/models/geo_node_status.rb
app/models/geo_node_status.rb
+2
-0
lib/gitlab/geo/health_check.rb
lib/gitlab/geo/health_check.rb
+1
-1
No files found.
app/models/geo_node_status.rb
View file @
9deaf60d
...
@@ -6,6 +6,8 @@ class GeoNodeStatus
...
@@ -6,6 +6,8 @@ class GeoNodeStatus
def
health
def
health
@health
||=
HealthCheck
::
Utils
.
process_checks
([
'geo'
])
@health
||=
HealthCheck
::
Utils
.
process_checks
([
'geo'
])
rescue
NotImplementedError
=>
e
@health
=
e
.
to_s
end
end
def
healthy?
def
healthy?
...
...
lib/gitlab/geo/health_check.rb
View file @
9deaf60d
...
@@ -2,7 +2,7 @@ module Gitlab
...
@@ -2,7 +2,7 @@ module Gitlab
module
Geo
module
Geo
class
HealthCheck
class
HealthCheck
def
self
.
perform_checks
def
self
.
perform_checks
raise
NotImplementedError
unless
Gitlab
::
Database
.
postgresql?
raise
NotImplementedError
.
new
(
'Geo is only compatible with PostgreSQL'
)
unless
Gitlab
::
Database
.
postgresql?
return
''
unless
Gitlab
::
Geo
.
secondary?
return
''
unless
Gitlab
::
Geo
.
secondary?
return
'The Geo secondary role is disabled.'
unless
Gitlab
::
Geo
.
secondary_role_enabled?
return
'The Geo secondary role is disabled.'
unless
Gitlab
::
Geo
.
secondary_role_enabled?
...
...
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