From 8cd9f730d7748501cc8150ce0e89bc536392bd22 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 11 Jun 2023 11:53:29 +0800 Subject: [PATCH 1/3] zk --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f831a2963..33896aacc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -54,7 +54,7 @@ services: zookeeper: - image: wurstmeister/zookeeper:latest + image: zookeeper ports: - 2181:2181 container_name: zookeeper From 7d7842c54e78d253b3851b3a84d7beebaf6b94dd Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 11 Jun 2023 12:37:36 +0800 Subject: [PATCH 2/3] conn --- internal/msggateway/n_ws_server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index ede5bea05..bc15de73e 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -1,14 +1,14 @@ package msggateway import ( - context2 "context" "errors" - "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "net/http" "sync" "sync/atomic" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" @@ -198,7 +198,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) { httpError(context, errs.ErrConnArgsErr) return } - log.ZDebug(context2.Background(), "conn", "platformID", platformID) + // log.ZDebug(context2.Background(), "conn", "platformID", platformID) err := tokenverify.WsVerifyToken(token, userID, platformID) if err != nil { httpError(context, err) From 52fa0463464725d6764143062de98a6ea8197ffc Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 11 Jun 2023 13:00:24 +0800 Subject: [PATCH 3/3] msg --- pkg/common/log/zk_logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/log/zk_logger.go b/pkg/common/log/zk_logger.go index 629cee2b9..ccb116623 100644 --- a/pkg/common/log/zk_logger.go +++ b/pkg/common/log/zk_logger.go @@ -8,5 +8,5 @@ import ( type ZkLogger struct{} func (l *ZkLogger) Printf(format string, a ...interface{}) { - ZInfo(context.Background(), fmt.Sprintf(format, a...)) + ZInfo(context.Background(), "zookeeper output", "msg", fmt.Sprintf(format, a...)) }