AUTH-2596 added new logger package and replaced logrus

sshlog/empty_manager.go

@@ -3,7 +3,7 @@ package sshlog
 import (
 	"io"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 )
 
 //empty manager implements the Manager but does nothing (for testing and to disable logging unless the logs are set)
@@ -18,11 +18,11 @@ func NewEmptyManager() Manager {
 	return &emptyManager{}
 }
 
-func (m *emptyManager) NewLogger(name string, logger *logrus.Logger) (io.WriteCloser, error) {
+func (m *emptyManager) NewLogger(name string, logger logger.Service) (io.WriteCloser, error) {
 	return &emptyWriteCloser{}, nil
 }
 
-func (m *emptyManager) NewSessionLogger(name string, logger *logrus.Logger) (io.WriteCloser, error) {
+func (m *emptyManager) NewSessionLogger(name string, logger logger.Service) (io.WriteCloser, error) {
 	return &emptyWriteCloser{}, nil
 }
 

sshlog/logger.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 )
 
 const (
@@ -24,7 +24,7 @@ type Logger struct {
 	filename      string
 	file          *os.File
 	writeBuffer   *bufio.Writer
-	logger        *logrus.Logger
+	logger        logger.Service
 	flushInterval time.Duration
 	maxFileSize   int64
 	done          chan struct{}
@@ -35,10 +35,10 @@ type Logger struct {
 // drained and closed when the caller is finished, so instances should call
 // Close when finished with this Logger instance. Writes will be flushed to disk
 // every second (fsync). filename is the name of the logfile to be created. The
-// logger variable is a logrus that will log all i/o, filesystem error etc, that
+// logger variable is a logger service that will log all i/o, filesystem error etc, that
 // that shouldn't end execution of the logger, but are useful to report to the
 // caller.
-func NewLogger(filename string, logger *logrus.Logger, flushInterval time.Duration, maxFileSize int64) (*Logger, error) {
+func NewLogger(filename string, logger logger.Service, flushInterval time.Duration, maxFileSize int64) (*Logger, error) {
 	if logger == nil {
 		return nil, errors.New("logger can't be nil")
 	}
@@ -87,7 +87,7 @@ func (l *Logger) writer() {
 		select {
 		case <-ticker.C:
 			if err := l.write(); err != nil {
-				l.logger.Errorln(err)
+				l.logger.Errorf("%s", err)
 			}
 		case <-l.done:
 			return

sshlog/logger_test.go

@@ -8,20 +8,21 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 )
 
 const logFileName = "test-logger.log"
 
 func createLogger(t *testing.T) *Logger {
 	os.Remove(logFileName)
-	l := logrus.New()
+	l := logger.NewOutputWriter(logger.NewMockWriteManager())
 	logger, err := NewLogger(logFileName, l, time.Millisecond, 1024)
 	if err != nil {
 		t.Fatal("couldn't create the logger!", err)
 	}
 	return logger
 }
+
 // AUTH-2115 TODO: fix this test
 //func TestWrite(t *testing.T) {
 //	testStr := "hi"

sshlog/manager.go

@@ -5,13 +5,13 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 )
 
 // Manager be managing logs bruh
 type Manager interface {
-	NewLogger(string, *logrus.Logger) (io.WriteCloser, error)
-	NewSessionLogger(string, *logrus.Logger) (io.WriteCloser, error)
+	NewLogger(string, logger.Service) (io.WriteCloser, error)
+	NewSessionLogger(string, logger.Service) (io.WriteCloser, error)
 }
 
 type manager struct {
@@ -25,10 +25,10 @@ func New(baseDirectory string) Manager {
 	}
 }
 
-func (m *manager) NewLogger(name string, logger *logrus.Logger) (io.WriteCloser, error) {
+func (m *manager) NewLogger(name string, logger logger.Service) (io.WriteCloser, error) {
 	return NewLogger(filepath.Join(m.baseDirectory, name), logger, time.Second, defaultFileSizeLimit)
 }
 
-func (m *manager) NewSessionLogger(name string, logger *logrus.Logger) (io.WriteCloser, error) {
+func (m *manager) NewSessionLogger(name string, logger logger.Service) (io.WriteCloser, error) {
 	return NewSessionLogger(filepath.Join(m.baseDirectory, name), logger, time.Second, defaultFileSizeLimit)
 }

sshlog/session_logger.go

@@ -3,7 +3,7 @@ package sshlog
 import (
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 	capnp "zombiezen.com/go/capnproto2"
 	"zombiezen.com/go/capnproto2/pogs"
 )
@@ -20,7 +20,7 @@ type sessionLogData struct {
 }
 
 // NewSessionLogger creates a new session logger by encapsulating a Logger object and writing capnp encoded messages to it
-func NewSessionLogger(filename string, logger *logrus.Logger, flushInterval time.Duration, maxFileSize int64) (*SessionLogger, error) {
+func NewSessionLogger(filename string, logger logger.Service, flushInterval time.Duration, maxFileSize int64) (*SessionLogger, error) {
 	l, err := NewLogger(filename, logger, flushInterval, maxFileSize)
 	if err != nil {
 		return nil, err

sshlog/session_logger_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/cloudflare/cloudflared/logger"
 	capnp "zombiezen.com/go/capnproto2"
 )
 
@@ -13,7 +13,7 @@ const sessionLogFileName = "test-session-logger.log"
 
 func createSessionLogger(t *testing.T) *SessionLogger {
 	os.Remove(sessionLogFileName)
-	l := logrus.New()
+	l := logger.NewOutputWriter(logger.NewMockWriteManager())
 	logger, err := NewSessionLogger(sessionLogFileName, l, time.Millisecond, 1024)
 	if err != nil {
 		t.Fatal("couldn't create the logger!", err)