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
31883b10
Commit
31883b10
authored
5 years ago
by
Aksel Baardsen
Browse files
Options
Downloads
Patches
Plain Diff
added status codes as strings diag
parent
f785ee22
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
+20
-7
20 additions, 7 deletions
pkg/diag.go
with
20 additions
and
7 deletions
pkg/diag.go
+
20
−
7
View file @
31883b10
package
pkg
import
(
"fmt"
"strconv"
"strings"
"time"
)
...
...
@@ -16,8 +17,8 @@ func init() {
// struct for returning requested data
type
Diag
struct
{
Gbif
in
t
`json:"gbif,omitempty"`
Restcountries
in
t
`json:"restcountries,omitempty"`
Gbif
str
in
g
`json:"gbif,omitempty"`
Restcountries
str
in
g
`json:"restcountries,omitempty"`
Version
string
`json:"version,omitempty"`
Uptime
int
`json:"uptime,omitempty"`
}
...
...
@@ -27,12 +28,22 @@ func GetDiag(d* Diag) error {
// gets status of GBIF api, returns appropriate error
if
err
:=
getGbifStatus
(
d
);
err
!=
nil
{
return
fmt
.
Errorf
(
"error occured while contacting GBIF API: %s"
,
err
)
// 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"
}
else
{
return
err
}
}
// gets status of restcountries api, returns appropriate error
if
err
:=
getRestStatus
(
d
);
err
!=
nil
{
return
fmt
.
Errorf
(
"error occured while contacting Restcountries API: %s"
,
err
)
// 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"
}
else
{
return
err
}
}
d
.
Version
=
"v1"
...
...
@@ -48,7 +59,8 @@ func getGbifStatus(d *Diag) error {
if
err
!=
nil
{
return
err
}
d
.
Gbif
=
resp
.
StatusCode
defer
resp
.
Body
.
Close
()
d
.
Gbif
=
strconv
.
Itoa
(
resp
.
StatusCode
)
return
nil
}
...
...
@@ -58,7 +70,8 @@ func getRestStatus(d *Diag) error {
if
err
!=
nil
{
return
err
}
d
.
Restcountries
=
resp
.
StatusCode
defer
resp
.
Body
.
Close
()
d
.
Restcountries
=
strconv
.
Itoa
(
resp
.
StatusCode
)
return
nil
}
...
...
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