Skip to content

Improve the API ping in configure command #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kytrinyx merged 1 commit into from
Jul 25, 2018
Merged

Improve the API ping in configure command #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions api/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,18 @@ func (c *Client) TokenIsValid() (bool, error) {
}

// IsPingable calls the API /ping to determine whether the API can be reached.
func (c *Client) IsPingable() (bool, error) {
func (c *Client) IsPingable() error {
url := fmt.Sprintf("%s/ping", c.APIBaseURL)
req, err := c.NewRequest("GET", url, nil)
if err != nil {
return false, err
return err
}
resp, err := c.Do(req)
if err != nil {
return false, err
return err
}
return resp.StatusCode == http.StatusOK, nil
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("API returned %s", resp.Status)
}
return nil
}
3 changes: 1 addition & 2 deletions cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ func runConfigure(configuration config.Configuration, flags *pflag.FlagSet) erro
return err
}

ok, err := client.IsPingable()
if !ok || err != nil {
if err := client.IsPingable(); err != nil {
return fmt.Errorf("The base API URL '%s' cannot be reached.\n\n%s", baseURL, err)
}
}
Expand Down