upgrading pkg tools

openimsdk · Dec 24, 2024 · 2e8ca5f · 2e8ca5f
1 parent df0cd3c
commit 2e8ca5f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openimsdk/protocol v0.0.72-alpha.68
-	github.com/openimsdk/tools v0.0.50-alpha.60
+	github.com/openimsdk/tools v0.0.50-alpha.61
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0

diff --git a/go.sum b/go.sum
@@ -349,8 +349,8 @@ github.com/openimsdk/gomake v0.0.15-alpha.2 h1:5Q8yl8ezy2yx+q8/ucU/t4kJnDfCzNOrk
 github.com/openimsdk/gomake v0.0.15-alpha.2/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
 github.com/openimsdk/protocol v0.0.72-alpha.68 h1:Ekn6S9Ftt12Xs/p9kJ39RDr2gSwIczz+MmSHQE4lAek=
 github.com/openimsdk/protocol v0.0.72-alpha.68/go.mod h1:Iet+piS/jaS+kWWyj6EEr36mk4ISzIRYjoMSVA4dq2M=
-github.com/openimsdk/tools v0.0.50-alpha.60 h1:dYqYpSdSN5o6CxlEjua2USfwfUiG0tUWFBpqghTjbWE=
-github.com/openimsdk/tools v0.0.50-alpha.60/go.mod h1:muCtxguNJv8lFwLei27UASu2Nvg4ERSeN0R4K5tivk0=
+github.com/openimsdk/tools v0.0.50-alpha.61 h1:zKEZwrj+fUVuyC6KR3kZp9zFaCCIFgoSbHO0r0mZ6h4=
+github.com/openimsdk/tools v0.0.50-alpha.61/go.mod h1:JowL2jYr8tu4vcQe+5hJh4v3BtSx1T0CIS3pgU/Mw+U=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go
@@ -131,7 +131,7 @@ func (c *Client) readMessage() {
 	defer func() {
 		if r := recover(); r != nil {
 			c.closedErr = ErrPanic
-			log.ZPanic(c.ctx, "socket have panic err:", r)
+			log.ZPanic(c.ctx, "socket have panic err:", errs.ErrPanic(r))
 		}
 		c.close()
 	}()
@@ -376,7 +376,7 @@ func (c *Client) activeHeartbeat(ctx context.Context) {
 		go func() {
 			defer func() {
 				if r := recover(); r != nil {
-					log.ZPanic(ctx, "activeHeartbeat Panic", r)
+					log.ZPanic(ctx, "activeHeartbeat Panic", errs.ErrPanic(r))
 				}
 			}()
 			log.ZDebug(ctx, "server initiative send heartbeat start.")

diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go
@@ -195,7 +195,7 @@ func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDisco
 		go func() {
 			defer func() {
 				if r := recover(); r != nil {
-					log.ZPanic(m.ctx, "MsgTransfer Start Panic", r)
+					log.ZPanic(m.ctx, "MsgTransfer Start Panic", errs.ErrPanic(r))
 				}
 			}()
 			if err := prommetrics.TransferInit(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {

diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go
@@ -361,7 +361,7 @@ func (och *OnlineHistoryRedisConsumerHandler) handleNotification(ctx context.Con
 func (och *OnlineHistoryRedisConsumerHandler) HandleUserHasReadSeqMessages(ctx context.Context) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.ZPanic(ctx, "HandleUserHasReadSeqMessages Panic", r)
+			log.ZPanic(ctx, "HandleUserHasReadSeqMessages Panic", errs.ErrPanic(r))
 		}
 	}()
 

diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go
@@ -88,7 +88,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa
 
 	defer func() {
 		if r := recover(); r != nil {
-			log.ZPanic(nctx, "setConversationAtInfo Panic", r)
+			log.ZPanic(nctx, "setConversationAtInfo Panic", errs.ErrPanic(r))
 		}
 	}()
 

diff --git a/pkg/rpccache/subscriber.go b/pkg/rpccache/subscriber.go
@@ -17,14 +17,15 @@ package rpccache
 import (
 	"context"
 	"encoding/json"
+	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/redis/go-redis/v9"
 )
 
 func subscriberRedisDeleteCache(ctx context.Context, client redis.UniversalClient, channel string, del func(ctx context.Context, key ...string)) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.ZPanic(ctx, "subscriberRedisDeleteCache Panic", r)
+			log.ZPanic(ctx, "subscriberRedisDeleteCache Panic", errs.ErrPanic(r))
 		}
 	}()
 	for message := range client.Subscribe(ctx, channel).Channel() {