IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): improve error handling

Browse Source
This commit is contained in:
bergquist
2016-10-21 16:03:02 +02:00
parent 2c7dbde06a
commit 6e65c93203
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cmd/grafana-cli/services/services.go
View File

@@ -35,11 +35,11 @@ func Init(version string) {
} }
func ListAllPlugins(repoUrl string) (m.PluginRepo, error) { func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
body, err := createRequest(repoUrl, "repo") body, err := sendRequest(repoUrl, "repo")
if err != nil { if err != nil {
logger.Info("Failed to create request", "error", err) logger.Info("Failed to send request", "error", err)
return m.PluginRepo{}, fmt.Errorf("Failed to create request. error: %v", err) return m.PluginRepo{}, fmt.Errorf("Failed to send request. error: %v", err)
} }
if err != nil { if err != nil {
@@ -112,11 +112,11 @@ func RemoveInstalledPlugin(pluginPath, pluginName string) error {
} }
func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) { func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
body, err := createRequest(repoUrl, "repo", pluginId) body, err := sendRequest(repoUrl, "repo", pluginId)
if err != nil { if err != nil {
logger.Info("Failed to create request", "error", err) logger.Info("Failed to send request", "error", err)
return m.Plugin{}, fmt.Errorf("Failed to create request. error: %v", err) return m.Plugin{}, fmt.Errorf("Failed to send request. error: %v", err)
} }
if err != nil { if err != nil {
@@ -133,7 +133,7 @@ func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
return data, nil return data, nil
} }
func createRequest(repoUrl string, subPaths ...string) ([]byte, error) { func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) {
u, _ := url.Parse(repoUrl) u, _ := url.Parse(repoUrl)
for _, v := range subPaths { for _, v := range subPaths {
u.Path = path.Join(u.Path, v) u.Path = path.Join(u.Path, v)
@@ -149,6 +149,10 @@ func createRequest(repoUrl string, subPaths ...string) ([]byte, error) {
} }
res, err := HttpClient.Do(req) res, err := HttpClient.Do(req)
if err != nil {
return []byte{}, err
}
if res.StatusCode/100 != 2 { if res.StatusCode/100 != 2 {
return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status) return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status)
} }