From 7ef62d28a5c03bb27387e5aa6df60fa0328eb830 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 7 Mar 2016 16:06:35 +0100 Subject: [PATCH] feat(cli): add logging to catch panics --- pkg/cmd/grafana-cli/commands/install_command.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index 181b899554b..773d5958f4c 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -43,7 +43,11 @@ func installCommand(c CommandLine) error { pluginToInstall := c.Args().First() version := c.Args().Get(1) - log.Infof("version: %v\n", version) + if version == "" { + log.Infof("version: latest\n") + } else { + log.Infof("version: %v\n", version) + } return InstallPlugin(pluginToInstall, pluginFolder, version, c.GlobalString("repo")) } @@ -62,6 +66,10 @@ func InstallPlugin(pluginName, pluginFolder, version, repoUrl string) error { url := v.Url commit := v.Commit + if version == "" { + version = v.Version + } + downloadURL := url + "/archive/" + commit + ".zip" log.Infof("installing %v @ %v\n", plugin.Id, version) @@ -114,6 +122,12 @@ func downloadFile(pluginName, filepath, url string) (err error) { if err != nil { return err } + log.Infof("Got statuscode %s from %s\n", resp.Status, url) + + if resp.StatusCode == 302 || resp.StatusCode == 301 { + str, _ := ioutil.ReadAll(resp.Body) + log.Info("body %s\n\n", string(str)) + } r, err := zip.NewReader(bytes.NewReader(body), resp.ContentLength) if err != nil {