Update logging

logging/logging.go

@@ -12,8 +12,12 @@ type LogArgs struct {
 	LogLevel string `arg:"-l, --log-level" default:"info" help:"Set the logging level (debug, info, warn, error)"`
 }
 
+type Logger struct {
+	*logrus.Logger
+}
+
 // NewLogger returns a new logger with the given log level (info, debug, warn, error)
-func NewLogger(logLevel string) *logrus.Logger {
+func NewLogger(logLevel string) *Logger {
 	log := logrus.New()
 	log.Formatter = new(customFormatter)
 	switch logLevel {
@@ -29,7 +33,7 @@ func NewLogger(logLevel string) *logrus.Logger {
 		log.SetLevel(logrus.InfoLevel)
 		log.Warnf("Unknown log level '%s', defaulting to info", logLevel)
 	}
-	return log
+	return &Logger{log}
 }
 
 type customFormatter struct{}

saltutil/saltutil.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/TheCacophonyProject/go-utils/logging"
-	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -24,7 +23,7 @@ type Grains struct {
 	Group       string `json:"group,omitempty"`
 }
 
-func SetGrains(grains Grains, log *logrus.Logger) error {
+func SetGrains(grains Grains, log *logging.Logger) error {
 	// Setup logger if none is provided
 	if log == nil {
 		log = logging.NewLogger("info")
@@ -48,7 +47,7 @@ func SetGrains(grains Grains, log *logrus.Logger) error {
 }
 
 // GetSaltGrains returns the salt grains. Optional to pass a logger, pass nil to use default.
-func GetSaltGrains(log *logrus.Logger) (*Grains, error) {
+func GetSaltGrains(log *logging.Logger) (*Grains, error) {
 	// Setup logger if none is provided
 	if log == nil {
 		log = logging.NewLogger("info")
@@ -114,7 +113,7 @@ func GetNodegroupFromFile() (string, error) {
 	return strings.TrimSpace(string(nodegroup)), nil
 }
 
-func GetMinionID(log *logrus.Logger) (string, error) {
+func GetMinionID(log *logging.Logger) (string, error) {
 	// Setup logger if none is provided
 	if log == nil {
 		log = logging.NewLogger("info")