diff --git a/config/openim-msgtransfer.yml b/config/openim-msgtransfer.yml index a92890089..9cb1598b5 100644 --- a/config/openim-msgtransfer.yml +++ b/config/openim-msgtransfer.yml @@ -1,5 +1,3 @@ prometheus: enable: true ports: [ 20108, 20109, 20110, 20111 ] - -msgCacheTimeout: 86400 \ No newline at end of file diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index a1f10b3b3..685e847b8 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -88,7 +88,7 @@ func Start(ctx context.Context, index int, config *Config) error { client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin"))) //todo MsgCacheTimeout - msgModel := cache.NewMsgCache(rdb, 86400, config.RedisConfig.EnablePipeline) + msgModel := cache.NewMsgCache(rdb, config.RedisConfig.EnablePipeline) seqModel := cache.NewSeqCache(rdb) msgDocModel, err := mgo.NewMsgMongo(mgocli.GetDB()) if err != nil { diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 2a0325391..81720d674 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -86,7 +86,7 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg return err } //todo MsgCacheTimeout - msgModel := cache.NewMsgCache(rdb, 86400, config.RedisConfig.EnablePipeline) + msgModel := cache.NewMsgCache(rdb, config.RedisConfig.EnablePipeline) seqModel := cache.NewSeqCache(rdb) conversationClient := rpcclient.NewConversationRpcClient(client, config.Share.RpcRegisterName.Conversation) userRpcClient := rpcclient.NewUserRpcClient(client, config.Share.RpcRegisterName.User, config.Share.IMAdminUserID) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 6ad3d9994..19edccbab 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -185,8 +185,7 @@ type MsgGateway struct { } type MsgTransfer struct { - Prometheus Prometheus `mapstructure:"prometheus"` - MsgCacheTimeout int `mapstructure:"msgCacheTimeout"` + Prometheus Prometheus `mapstructure:"prometheus"` } type Push struct { diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index 56ea2dd8b..94307343f 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -31,6 +31,8 @@ import ( "golang.org/x/sync/errgroup" ) +const msgCacheTimeout = 86400 + const ( maxSeq = "MAX_SEQ:" minSeq = "MIN_SEQ:" @@ -82,7 +84,7 @@ type MsgCache interface { // return &msgCache{rdb: client, msgCacheTimeout: msgCacheTimeout, redisConf: redisConf} //} -func NewMsgCache(client redis.UniversalClient, msgCacheTimeout time.Duration, redisEnablePipeline bool) MsgCache { +func NewMsgCache(client redis.UniversalClient, redisEnablePipeline bool) MsgCache { return &msgCache{rdb: client, msgCacheTimeout: msgCacheTimeout, redisEnablePipeline: redisEnablePipeline} }