Clean up logrus

Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
This commit is contained in:
Charlie Drage
2017-02-27 10:53:24 -05:00
parent 135165b39c
commit c0043ebd11
9 changed files with 109 additions and 109 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"io"
"os"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -30,7 +30,7 @@ var completion = &cobra.Command{
err := Generate(cmd, args)
if err != nil {
logrus.Fatalf("Error: %s", err)
log.Fatalf("Error: %s", err)
}
return nil
+11 -11
View File
@@ -21,7 +21,7 @@ import (
"os"
"strings"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -30,12 +30,12 @@ import (
// Hook for erroring and exit out on warning
type errorOnWarningHook struct{}
func (errorOnWarningHook) Levels() []logrus.Level {
return []logrus.Level{logrus.WarnLevel}
func (errorOnWarningHook) Levels() []log.Level {
return []log.Level{log.WarnLevel}
}
func (errorOnWarningHook) Fire(entry *logrus.Entry) error {
logrus.Fatalln(entry.Message)
func (errorOnWarningHook) Fire(entry *log.Entry) error {
log.Fatalln(entry.Message)
return nil
}
@@ -61,27 +61,27 @@ var RootCmd = &cobra.Command{
// Add extra logging when verbosity is passed
if GlobalVerbose {
logrus.SetLevel(logrus.DebugLevel)
log.SetLevel(log.DebugLevel)
}
// Disable the timestamp (Kompose is too fast!)
formatter := new(logrus.TextFormatter)
formatter := new(log.TextFormatter)
formatter.DisableTimestamp = true
formatter.ForceColors = true
logrus.SetFormatter(formatter)
log.SetFormatter(formatter)
// Set the appropriate suppress warnings and error on warning flags
if GlobalSuppressWarnings {
logrus.SetLevel(logrus.ErrorLevel)
log.SetLevel(log.ErrorLevel)
} else if GlobalErrorOnWarning {
hook := errorOnWarningHook{}
logrus.AddHook(hook)
log.AddHook(hook)
}
// Error out of the user has not chosen Kubernetes or OpenShift
provider := strings.ToLower(GlobalProvider)
if provider != "kubernetes" && provider != "openshift" {
logrus.Fatalf("%s is an unsupported provider. Supported providers are: 'kubernetes', 'openshift'.", GlobalProvider)
log.Fatalf("%s is an unsupported provider. Supported providers are: 'kubernetes', 'openshift'.", GlobalProvider)
}
},