From 59cbabed8e8c8bd62b596c59ba35188e207cf2d2 Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Wed, 25 Dec 2024 15:47:07 +0800 Subject: [PATCH] fix: config --- internal/msggateway/ws_server.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index fe2c1398f..f679bdd71 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -4,12 +4,13 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/rpcli" "net/http" "sync" "sync/atomic" "time" + "github.com/openimsdk/open-im-server/v3/pkg/rpcli" + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd" "github.com/openimsdk/open-im-server/v3/pkg/common/webhook" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" @@ -189,8 +190,9 @@ func (ws *WsServer) Run(done chan error) error { netErr = errs.WrapMsg(err, "ws start err", server.Addr) } }() - ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) shutDown := func() error { + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + defer cancel() sErr := server.Shutdown(ctx) if sErr != nil { return errs.WrapMsg(sErr, "shutdown err") @@ -198,8 +200,8 @@ func (ws *WsServer) Run(done chan error) error { close(shutdownDone) return nil } + log.ZError(context.Background(), "NJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ", nil) etcd.RegisterShutDown(shutDown) - defer cancel() var err error select { case err = <-done: