opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-25 18:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): improve logging when folders does not exists

Browse Source
This commit is contained in:
bergquist
2016-03-07 16:41:22 +01:00
parent 7ef62d28a5
commit 1a6af064b0
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/grafana-cli/commands/commands.go
View File

@ -11,7 +11,7 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C
cmd := &contextCommandLine{context} cmd := &contextCommandLine{context}
if err := command(cmd); err != nil { if err := command(cmd); err != nil {
log.Errorf("%v\n\n", err) log.Errorf("%s\n\n", err)
cmd.ShowHelp() cmd.ShowHelp()
os.Exit(1) os.Exit(1)

15
pkg/cmd/grafana-cli/commands/ls_command.go
View File

@ -2,6 +2,7 @@ package commands
import ( import (
"errors" "errors"
"fmt"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/log" "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models" m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services" s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
@ -14,11 +15,11 @@ var validateLsCommmand = func(pluginDir string) error {
return errors.New("missing path flag") return errors.New("missing path flag")
} }
log.Info("plugindir: " + pluginDir + "\n") log.Debug("plugindir: " + pluginDir + "\n")
pluginDirInfo, err := s.IoHelper.Stat(pluginDir) pluginDirInfo, err := s.IoHelper.Stat(pluginDir)
if err != nil { if err != nil {
return errors.New("missing path flag") return fmt.Errorf("error: %s", err)
} }
if pluginDirInfo.IsDir() == false { if pluginDirInfo.IsDir() == false {
@ -34,8 +35,14 @@ func lsCommand(c CommandLine) error {
return err return err
} }
for _, plugin := range ls_getPlugins(pluginDir) { plugins := ls_getPlugins(pluginDir)
log.Infof("plugin: %s @ %s \n", plugin.Name, plugin.Info.Version)
if len(plugins) > 0 {
log.Info("installed plugins:\n")
}
for _, plugin := range plugins {
log.Infof("%s @ %s \n", plugin.Id, plugin.Info.Version)
} }
return nil return nil