Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Assignment 1
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aksel Baardsen
Assignment 1
Commits
137637d4
Commit
137637d4
authored
Oct 20, 2019
by
Aksel Baardsen
Browse files
Options
Downloads
Patches
Plain Diff
uptime is now float64(time.seconds original) && status code fix
parent
d057bf9a
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/diag.go
+8
-8
8 additions, 8 deletions
pkg/diag.go
with
8 additions
and
8 deletions
pkg/diag.go
+
8
−
8
View file @
137637d4
...
...
@@ -20,7 +20,7 @@ type Diag struct {
Gbif
string
`json:"gbif,omitempty"`
Restcountries
string
`json:"restcountries,omitempty"`
Version
string
`json:"version,omitempty"`
Uptime
int
`json:"uptime,omitempty"`
Uptime
float64
`json:"uptime,omitempty"`
}
// sets up the struct above
...
...
@@ -28,9 +28,9 @@ func GetDiag(d* Diag) error {
// gets status of GBIF api, returns appropriate error
if
err
:=
getGbifStatus
(
d
);
err
!=
nil
{
// if it was a timeout caused by the http.client
if
strings
.
Contains
(
err
.
Error
(),
"error occured while contacting"
)
{
d
.
Gbif
=
"
503: Request timed out
"
// if it was a timeout caused by the http.client
there was no returned status code of API
if
strings
.
Contains
(
err
.
Error
(),
"error occur
r
ed while contacting"
)
{
d
.
Gbif
=
"
The server did not give a timely response: No status code returned
"
}
else
{
return
err
}
...
...
@@ -38,9 +38,9 @@ func GetDiag(d* Diag) error {
// gets status of restcountries api, returns appropriate error
if
err
:=
getRestStatus
(
d
);
err
!=
nil
{
// if it was a timeout caused by the http.client
if
strings
.
Contains
(
err
.
Error
(),
"error occured while contacting"
)
{
d
.
Gbif
=
"
503: Request timed out
"
// if it was a timeout caused by the http.client
there was no returned status code of API
if
strings
.
Contains
(
err
.
Error
(),
"error occur
r
ed while contacting"
)
{
d
.
Gbif
=
"
The server did not give a timely response: No status code returned
"
}
else
{
return
err
}
...
...
@@ -78,5 +78,5 @@ func getRestStatus(d *Diag) error {
// Returns application uptime in seconds
func
getUptime
(
d
*
Diag
)
{
up
:=
time
.
Since
(
startTime
)
.
Seconds
()
d
.
Uptime
=
int
(
up
)
d
.
Uptime
=
up
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment