Switch to logrus logger in gitprovider

Author: Tobias Meinhardt

gitprovider/logging.go

@@ -1,38 +1,45 @@
 package gitprovider
 
 import (
-	"time"
-
-	"github.com/go-kit/kit/log"
 	"github.com/meinto/glow"
+	l "github.com/meinto/glow/logging"
+	"github.com/sirupsen/logrus"
 )
 
 type loggingService struct {
-	logger log.Logger
-	next   Service
+	next Service
 }
 
-func NewLoggingService(l log.Logger, s Service) Service {
-	return &loggingService{l, s}
+func NewLoggingService(s Service) Service {
+	return &loggingService{s}
 }
 
 func (s *loggingService) Close(b glow.Branch) (err error) {
-	defer func(begin time.Time) {
-		s.logger.Log("method", "Close", "took", time.Since(begin), "err", err)
-	}(time.Now())
+	defer func() {
+		l.Log().WithFields(logrus.Fields{
+			"branch": b.BranchName(),
+			"error":  err,
+		}).Info()
+	}()
 	return s.next.Close(b)
 }
 
 func (s *loggingService) Publish(b glow.Branch) (err error) {
-	defer func(begin time.Time) {
-		s.logger.Log("method", "Publish", "took", time.Since(begin), "err", err)
-	}(time.Now())
+	defer func() {
+		l.Log().WithFields(logrus.Fields{
+			"branch": b.BranchName(),
+			"error":  err,
+		}).Info()
+	}()
 	return s.next.Publish(b)
 }
 
-func (s *loggingService) GetCIBranch() (_ glow.Branch, err error) {
-	defer func(begin time.Time) {
-		s.logger.Log("method", "GetCIBranch", "took", time.Since(begin), "err", err)
-	}(time.Now())
+func (s *loggingService) GetCIBranch() (branch glow.Branch, err error) {
+	defer func() {
+		l.Log().WithFields(logrus.Fields{
+			"branch": branch.BranchName(),
+			"error":  err,
+		}).Info()
+	}()
 	return s.next.GetCIBranch()
 }

pkg/cli/cmd/util/common.go

@@ -3,13 +3,11 @@ package util
 import (
 	"errors"
 	"log"
-	"os"
 
 	"github.com/meinto/glow/cmd"
 
 	"github.com/meinto/glow/gitprovider"
 
-	kitlog "github.com/go-kit/kit/log"
 	"github.com/meinto/glow/git"
 	"github.com/spf13/viper"
 )
@@ -50,8 +48,6 @@ func GetGitProvider() (gitprovider.Service, error) {
 	default:
 		return nil, errors.New("git provider not specified")
 	}
-	logger := kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stderr))
-	logger = kitlog.With(logger, "ts", kitlog.DefaultTimestampUTC)
-	s = gitprovider.NewLoggingService(logger, s)
+	s = gitprovider.NewLoggingService(s)
 	return s, nil
 }