ws logger支持通过配置控制

config.go

@@ -9,14 +9,13 @@ package logger
 
 import (
 	"fmt"
+	"github.com/gin-gonic/gin"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"git.zhangdeman.cn/zhangdeman/consts"
-	"git.zhangdeman.cn/zhangdeman/websocket/storage"
-
 	"go.uber.org/zap/zapcore"
 )
 
@@ -236,7 +235,10 @@ type OptionLogger struct {
 	WithCallerSkip int                     // 跳过的调用数
 	ConsoleOutput  bool                    // 控制台输出
 	Encoder        zapcore.Encoder         // 编码函数
-	WsLoggerConnect storage.IConnection     `json:"-"` // ws 日志连接管理实例
+	WsServerProt   int                     // ws端口
+	WsGroup        string                  // ws分组
+	GinRouter      *gin.Engine             // gin路由实例
+	EnableWsLog    bool                    // 启用wsLog
 }
 
 // SetLoggerOptionFunc 设置日志配置
@@ -417,3 +419,16 @@ func GetEncoder(option ...SetLoggerOptionFunc) zapcore.Encoder {
 	}
 	return zapcore.NewJSONEncoder(ec)
 }
+
+// EnableWsLogger 启用wsLogger
+func EnableWsLogger(serverPort int, wsGroup string, router *gin.Engine) SetLoggerOptionFunc {
+	return func(o *OptionLogger) {
+		o.GinRouter = router
+		o.WsServerProt = serverPort
+		if len(wsGroup) == 0 {
+			wsGroup = "ws-log"
+		}
+		o.WsGroup = wsGroup
+		o.EnableWsLog = true
+	}
+}

logger.go

@@ -64,13 +64,15 @@ func NewLogger(inputLoggerLevel consts.LogLevel, splitConfig *RotateLogConfig, o
 		// zapcore.NewCore(o.Encoder, zapcore.AddSync(&wsWriter{}), loggerLevelDeal), // 设置ws日志输出
 	}
 
-	// TODO: 通过配置控制ws logger
-	if wsLoggerInstance, err := instance.NewWebsocketLog(80, nil); nil != err {
+	// 通过配置控制ws logger
+	if o.EnableWsLog {
+		if wsLoggerInstance, err := instance.NewWebsocketLog(o.WsServerProt, o.GinRouter); nil != err {
 			return nil, err
 		} else {
 			// 设置ws日志输出
 			fileHandlerList = append(fileHandlerList, zapcore.NewCore(o.Encoder, zapcore.AddSync(wsLoggerInstance.Writer()), loggerLevelDeal))
 		}
+	}
 
 	// 设置控制台输出
 	if o.ConsoleOutput {