Merge branch 'pks-log-yamux' into 'master'

grpc/backchannel: Simplify logging with yamux

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6330

Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Sami Hiltunen <shiltunen@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/NOTICE b/NOTICE
index 7d7a9d1ae..a30395535 100644
--- a/NOTICE
+++ b/NOTICE
@@ -16028,7 +16028,6 @@ package yamux
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"time"
 )
@@ -16076,7 +16075,7 @@ type Config struct {
 
 	// Logger is used to pass in the logger to be used. Either Logger or
 	// LogOutput can be set, not both.
-	Logger *log.Logger
+	Logger Logger
 }
 
 // DefaultConfig is used to return a default configuration
@@ -16176,7 +16175,7 @@ type Session struct {
 	config *Config
 
 	// logger is used for our logs
-	logger *log.Logger
+	logger Logger
 
 	// conn is the underlying connection
 	conn io.ReadWriteCloser
@@ -19111,6 +19110,13 @@ import (
 	"time"
 )
 
+// Logger is a abstract of *log.Logger
+type Logger interface {
+	Print(v ...interface{})
+	Printf(format string, v ...interface{})
+	Println(v ...interface{})
+}
+
 var (
 	timerPool = &sync.Pool{
 		New: func() interface{} {