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

Merge branch 'master' into alerting_definitions

Browse Source
This commit is contained in:
bergquist
2016-06-03 13:48:36 +02:00
parent d0ac258474 3d7facf6ee
commit 65eb373808
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-cli/commands/install_command.go
+2 -3
View File
@@ -17,7 +17,6 @@ import (
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"github.com/lunny/log"
)
func validateInput(c CommandLine, pluginFolder string) error {
@@ -89,7 +88,7 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
return err
}
log.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
logger.Infof("%s Installed %s successfully \n", color.GreenString("✔"), plugin.Id)
/* Enable once we need support for downloading depedencies
res, _ := s.ReadPlugin(pluginFolder, pluginName)
@@ -172,7 +171,7 @@ func downloadFile(pluginName, filePath, url string) (err error) {
src, err := zf.Open()
if err != nil {
log.Errorf("Failed to extract file: %v", err)
logger.Errorf("Failed to extract file: %v", err)
}
io.Copy(dst, src)
pkg/cmd/grafana-cli/main.go
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"github.com/codegangsta/cli"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
"github.com/lunny/log"
)
var version = "master"
@@ -24,7 +23,7 @@ func getGrafanaPluginDir() string {
pwd, err := os.Getwd()
if err != nil {
log.Error("Could not get current path. using default")
logger.Error("Could not get current path. using default")
return defaultNix
}