BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ad77ab03
Commit
ad77ab03
authored
May 12, 2016
by
DJ Mountney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Changelog entry
and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
parent
c8f23bd2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
11 deletions
+8
-11
CHANGELOG
CHANGELOG
+1
-0
health_check_controller.rb
app/controllers/admin/health_check_controller.rb
+1
-5
show.html.haml
app/views/admin/health_check/show.html.haml
+6
-6
No files found.
CHANGELOG
View file @
ad77ab03
...
...
@@ -12,6 +12,7 @@ v 8.8.0 (unreleased)
- Reduce delay in destroying a project from 1-minute to immediately
- Make build status canceled if any of the jobs was canceled and none failed
- Upgrade Sidekiq to 4.1.2
- Added /health_check endpoint for checking service status
- Sanitize repo paths in new project error message
- Bump mail_room to 0.7.0 to fix stuck IDLE connections
- Remove future dates from contribution calendar graph.
...
...
app/controllers/admin/health_check_controller.rb
View file @
ad77ab03
class
Admin
::
HealthCheckController
<
Admin
::
ApplicationController
def
show
begin
@errors
=
HealthCheck
::
Utils
.
process_checks
(
'standard'
)
rescue
=>
e
@errors
=
e
.
message
.
blank?
?
e
.
class
.
to_s
:
e
.
message
.
to_s
end
@errors
=
HealthCheck
::
Utils
.
process_checks
(
'standard'
)
end
end
app/views/admin/health_check/show.html.haml
View file @
ad77ab03
...
...
@@ -16,21 +16,21 @@
Health information can be reteived as plain text, json, or xml using:
%ul
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
)
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
,
format: :json
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
format: :json
)
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
,
format: :xml
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
format: :xml
)
%p
.light
You can also ask for the status of specific services:
%ul
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
,
checks: :cache
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
checks: :cache
)
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
,
checks: :database
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
checks: :database
)
%li
%code
=
health_check_url
(
token
:current_application_settings
.
health_check_access_token
,
checks: :migrations
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
checks: :migrations
)
%hr
.panel.panel-default
...
...
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