Просмотр исходного кода

Merge pull request #76 from wweir/master

Fix hashicorp/yamux#72, abstract logger into interface
Evan Phoenix 2 лет назад
Родитель
Сommit
8f49b6f63f
3 измененных файлов с 9 добавлено и 3 удалено
  1. 1 2
      mux.go
  2. 1 1
      session.go
  3. 7 0
      util.go

+ 1 - 2
mux.go

@@ -3,7 +3,6 @@ package yamux
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"time"
 )
@@ -51,7 +50,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

+ 1 - 1
session.go

@@ -34,7 +34,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

+ 7 - 0
util.go

@@ -5,6 +5,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{} {