Using fclairamb/go-log (#249)

This makes using a common logging framework between all libraries much easier
fclairamb · Jul 27, 2021 · 61f871a · 61f871a
1 parent a2f1f74
commit 61f871a
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 307 deletions.
diff --git a/client_handler.go b/client_handler.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/fclairamb/ftpserverlib/log"
+	log "github.com/fclairamb/go-log"
 )
 
 // HASHAlgo is the enumerable that represents the supported HASH algorithms

diff --git a/driver_test.go b/driver_test.go
@@ -11,10 +11,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/fclairamb/go-log/gokit"
 	gklog "github.com/go-kit/kit/log"
 	"github.com/spf13/afero"
-
-	"github.com/fclairamb/ftpserverlib/log/gokit"
 )
 
 type tlsVerificationReply int

diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/fclairamb/ftpserverlib
 go 1.16
 
 require (
-	github.com/go-kit/kit v0.10.0
+	github.com/fclairamb/go-log v0.0.0-20210725225107-80efc81cb386
+	github.com/go-kit/kit v0.11.0
 	github.com/secsy/goftp v0.0.0-20200609142545-aa2de14babf4
 	github.com/spf13/afero v1.6.0
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/text v0.3.4 // indirect
 )
 
 replace github.com/secsy/goftp => github.com/drakkan/goftp v0.0.0-20201220151643-27b7174e8caf
diff --git a/go.sum b/go.sum
diff --git a/log/gokit/go-kit.go b/log/gokit/go-kit.go
diff --git a/log/gokit/log_test.go b/log/gokit/log_test.go
diff --git a/log/log.go b/log/log.go
diff --git a/server.go b/server.go
@@ -8,7 +8,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/fclairamb/ftpserverlib/log"
+	log "github.com/fclairamb/go-log"
+	lognoop "github.com/fclairamb/go-log/noop"
 )
 
 var (
@@ -236,7 +237,7 @@ func (server *FtpServer) ListenAndServe() error {
 func NewFtpServer(driver MainDriver) *FtpServer {
 	return &FtpServer{
 		driver: driver,
-		Logger: log.Nothing(),
+		Logger: lognoop.NewNoOpLogger(),
 	}
 }
 

diff --git a/server_test.go b/server_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/fclairamb/ftpserverlib/log"
+	lognoop "github.com/fclairamb/go-log/noop"
 )
 
 func TestMain(m *testing.M) {
@@ -87,7 +87,7 @@ func TestListenerAcceptErrors(t *testing.T) {
 
 	server := FtpServer{
 		listener: newFakeListener(errNetFake),
-		Logger:   log.Nothing(),
+		Logger:   lognoop.NewNoOpLogger(),
 	}
 	err := server.Serve()
 	require.EqualError(t, err, errListenerAccept.Error())

diff --git a/transfer_pasv.go b/transfer_pasv.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/fclairamb/ftpserverlib/log"
+	log "github.com/fclairamb/go-log"
 )
 
 // Active/Passive transfer connection handler
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/fclairamb/ftpserverlib/log"
+    	log "github.com/fclairamb/go-log"
     )
     // HASHAlgo is the enumerable that represents the supported HASH algorithms
@@ Expand Down @@