From db3b0c8d0887da3cd8e60d434562ce03465b926d Mon Sep 17 00:00:00 2001 From: mountain Date: Wed, 6 Sep 2023 19:13:34 +0900 Subject: [PATCH] =?UTF-8?q?NewWebsocketHandler=EC=97=90=20redisClient?= =?UTF-8?q?=EB=A5=BC=20=EB=B0=9B=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wshandler/wshandler.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/wshandler/wshandler.go b/wshandler/wshandler.go index 950da01..ccf6fe1 100644 --- a/wshandler/wshandler.go +++ b/wshandler/wshandler.go @@ -156,17 +156,12 @@ func init() { gob.Register([]any{}) } -func NewWebsocketHandler(consumer session.Consumer) (*WebsocketHandler, error) { +func NewWebsocketHandler(consumer session.Consumer, redisClient *redis.Client) (*WebsocketHandler, error) { var config wsConfig if err := gocommon.LoadConfig(&config); err != nil { return nil, err } - redisSync, err := gocommon.NewRedisClient(config.Redis["wshandler"]) - if err != nil { - return nil, err - } - sendchan := make(chan send_msg_queue_elem, 1000) go func() { sender := func(elem *send_msg_queue_elem) { @@ -185,9 +180,9 @@ func NewWebsocketHandler(consumer session.Consumer) (*WebsocketHandler, error) { }() return &WebsocketHandler{ - redisMsgChanName: fmt.Sprintf("_wsh_msg_%d", redisSync.Options().DB), - redisCmdChanName: fmt.Sprintf("_wsh_cmd_%d", redisSync.Options().DB), - redisSync: redisSync, + redisMsgChanName: fmt.Sprintf("_wsh_msg_%d", redisClient.Options().DB), + redisCmdChanName: fmt.Sprintf("_wsh_cmd_%d", redisClient.Options().DB), + redisSync: redisClient, connInOutChan: make(chan *wsconn), deliveryChan: make(chan any, 1000), localDeliveryChan: make(chan any, 100),