mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-10-26 21:22:16 +08:00
feat: Group Monitoring Components, Enable Host Mode && Deprecate reliabilityLevel and unreadCount in notification.yml
This commit is contained in:
parent
18d68c148d
commit
cb12dbe623
@ -1,10 +1,8 @@
|
|||||||
groupCreated:
|
groupCreated:
|
||||||
isSendMsg: true
|
isSendMsg: true
|
||||||
# Reliability level of the message sending.
|
# Deprecated. Fixed as 1.
|
||||||
# Set to 1 to send only when online, 2 for guaranteed delivery.
|
|
||||||
reliabilityLevel: 1
|
reliabilityLevel: 1
|
||||||
# This setting is effective only when 'isSendMsg' is true.
|
# Deprecated. Fixed as false.
|
||||||
# It controls whether to count unread messages.
|
|
||||||
unreadCount: false
|
unreadCount: false
|
||||||
# Configuration for offline push notifications.
|
# Configuration for offline push notifications.
|
||||||
offlinePush:
|
offlinePush:
|
||||||
|
|||||||
@ -173,6 +173,7 @@ services:
|
|||||||
- ./config/alertmanager.yml:/etc/alertmanager/alertmanager.yml
|
- ./config/alertmanager.yml:/etc/alertmanager/alertmanager.yml
|
||||||
- ./config/email.tmpl:/etc/alertmanager/email.tmpl
|
- ./config/email.tmpl:/etc/alertmanager/email.tmpl
|
||||||
command:
|
command:
|
||||||
|
- '--config.file=/etc/alertmanager/alertmanager.yml'
|
||||||
- '--web.listen-address=:${ALERTMANAGER_PORT}'
|
- '--web.listen-address=:${ALERTMANAGER_PORT}'
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
|
||||||
|
|||||||
@ -56,5 +56,5 @@ func (a *AuthRpcCmd) Exec() error {
|
|||||||
func (a *AuthRpcCmd) runE() error {
|
func (a *AuthRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.authConfig.Discovery, &a.authConfig.RpcConfig.Prometheus, a.authConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.authConfig.Discovery, &a.authConfig.RpcConfig.Prometheus, a.authConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.authConfig.RpcConfig.RPC.RegisterIP, a.authConfig.RpcConfig.RPC.AutoSetPorts, a.authConfig.RpcConfig.RPC.Ports,
|
a.authConfig.RpcConfig.RPC.RegisterIP, a.authConfig.RpcConfig.RPC.AutoSetPorts, a.authConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.authConfig.Discovery.RpcService.Auth, &a.authConfig.Share, a.authConfig, auth.Start)
|
a.Index(), a.authConfig.Discovery.RpcService.Auth, nil, a.authConfig, auth.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -58,5 +58,5 @@ func (a *ConversationRpcCmd) Exec() error {
|
|||||||
func (a *ConversationRpcCmd) runE() error {
|
func (a *ConversationRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.conversationConfig.Discovery, &a.conversationConfig.RpcConfig.Prometheus, a.conversationConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.conversationConfig.Discovery, &a.conversationConfig.RpcConfig.Prometheus, a.conversationConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.conversationConfig.RpcConfig.RPC.RegisterIP, a.conversationConfig.RpcConfig.RPC.AutoSetPorts, a.conversationConfig.RpcConfig.RPC.Ports,
|
a.conversationConfig.RpcConfig.RPC.RegisterIP, a.conversationConfig.RpcConfig.RPC.AutoSetPorts, a.conversationConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.conversationConfig.Discovery.RpcService.Conversation, &a.conversationConfig.Share, a.conversationConfig, conversation.Start)
|
a.Index(), a.conversationConfig.Discovery.RpcService.Conversation, &a.conversationConfig.NotificationConfig, a.conversationConfig, conversation.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -59,5 +59,5 @@ func (a *FriendRpcCmd) Exec() error {
|
|||||||
func (a *FriendRpcCmd) runE() error {
|
func (a *FriendRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.relationConfig.Discovery, &a.relationConfig.RpcConfig.Prometheus, a.relationConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.relationConfig.Discovery, &a.relationConfig.RpcConfig.Prometheus, a.relationConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.relationConfig.RpcConfig.RPC.RegisterIP, a.relationConfig.RpcConfig.RPC.AutoSetPorts, a.relationConfig.RpcConfig.RPC.Ports,
|
a.relationConfig.RpcConfig.RPC.RegisterIP, a.relationConfig.RpcConfig.RPC.AutoSetPorts, a.relationConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.relationConfig.Discovery.RpcService.Friend, &a.relationConfig.Share, a.relationConfig, relation.Start)
|
a.Index(), a.relationConfig.Discovery.RpcService.Friend, &a.relationConfig.NotificationConfig, a.relationConfig, relation.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,5 +60,5 @@ func (a *GroupRpcCmd) Exec() error {
|
|||||||
func (a *GroupRpcCmd) runE() error {
|
func (a *GroupRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.groupConfig.Discovery, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.groupConfig.Discovery, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.groupConfig.RpcConfig.RPC.RegisterIP, a.groupConfig.RpcConfig.RPC.AutoSetPorts, a.groupConfig.RpcConfig.RPC.Ports,
|
a.groupConfig.RpcConfig.RPC.RegisterIP, a.groupConfig.RpcConfig.RPC.AutoSetPorts, a.groupConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.groupConfig.Discovery.RpcService.Group, &a.groupConfig.Share, a.groupConfig, group.Start, versionctx.EnableVersionCtx())
|
a.Index(), a.groupConfig.Discovery.RpcService.Group, &a.groupConfig.NotificationConfig, a.groupConfig, group.Start, versionctx.EnableVersionCtx())
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,5 +60,5 @@ func (a *MsgRpcCmd) Exec() error {
|
|||||||
func (a *MsgRpcCmd) runE() error {
|
func (a *MsgRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.msgConfig.Discovery, &a.msgConfig.RpcConfig.Prometheus, a.msgConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.msgConfig.Discovery, &a.msgConfig.RpcConfig.Prometheus, a.msgConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.msgConfig.RpcConfig.RPC.RegisterIP, a.msgConfig.RpcConfig.RPC.AutoSetPorts, a.msgConfig.RpcConfig.RPC.Ports,
|
a.msgConfig.RpcConfig.RPC.RegisterIP, a.msgConfig.RpcConfig.RPC.AutoSetPorts, a.msgConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.msgConfig.Discovery.RpcService.Msg, &a.msgConfig.Share, a.msgConfig, msg.Start)
|
a.Index(), a.msgConfig.Discovery.RpcService.Msg, &a.msgConfig.NotificationConfig, a.msgConfig, msg.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,5 +60,5 @@ func (a *PushRpcCmd) Exec() error {
|
|||||||
func (a *PushRpcCmd) runE() error {
|
func (a *PushRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.pushConfig.Discovery, &a.pushConfig.RpcConfig.Prometheus, a.pushConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.pushConfig.Discovery, &a.pushConfig.RpcConfig.Prometheus, a.pushConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.pushConfig.RpcConfig.RPC.RegisterIP, a.pushConfig.RpcConfig.RPC.AutoSetPorts, a.pushConfig.RpcConfig.RPC.Ports,
|
a.pushConfig.RpcConfig.RPC.RegisterIP, a.pushConfig.RpcConfig.RPC.AutoSetPorts, a.pushConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.pushConfig.Discovery.RpcService.Push, &a.pushConfig.Share, a.pushConfig, push.Start)
|
a.Index(), a.pushConfig.Discovery.RpcService.Push, &a.pushConfig.NotificationConfig, a.pushConfig, push.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -59,5 +59,5 @@ func (a *ThirdRpcCmd) Exec() error {
|
|||||||
func (a *ThirdRpcCmd) runE() error {
|
func (a *ThirdRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.thirdConfig.Discovery, &a.thirdConfig.RpcConfig.Prometheus, a.thirdConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.thirdConfig.Discovery, &a.thirdConfig.RpcConfig.Prometheus, a.thirdConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.thirdConfig.RpcConfig.RPC.RegisterIP, a.thirdConfig.RpcConfig.RPC.AutoSetPorts, a.thirdConfig.RpcConfig.RPC.Ports,
|
a.thirdConfig.RpcConfig.RPC.RegisterIP, a.thirdConfig.RpcConfig.RPC.AutoSetPorts, a.thirdConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.thirdConfig.Discovery.RpcService.Third, &a.thirdConfig.Share, a.thirdConfig, third.Start)
|
a.Index(), a.thirdConfig.Discovery.RpcService.Third, &a.thirdConfig.NotificationConfig, a.thirdConfig, third.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,5 +60,5 @@ func (a *UserRpcCmd) Exec() error {
|
|||||||
func (a *UserRpcCmd) runE() error {
|
func (a *UserRpcCmd) runE() error {
|
||||||
return startrpc.Start(a.ctx, &a.userConfig.Discovery, &a.userConfig.RpcConfig.Prometheus, a.userConfig.RpcConfig.RPC.ListenIP,
|
return startrpc.Start(a.ctx, &a.userConfig.Discovery, &a.userConfig.RpcConfig.Prometheus, a.userConfig.RpcConfig.RPC.ListenIP,
|
||||||
a.userConfig.RpcConfig.RPC.RegisterIP, a.userConfig.RpcConfig.RPC.AutoSetPorts, a.userConfig.RpcConfig.RPC.Ports,
|
a.userConfig.RpcConfig.RPC.RegisterIP, a.userConfig.RpcConfig.RPC.AutoSetPorts, a.userConfig.RpcConfig.RPC.Ports,
|
||||||
a.Index(), a.userConfig.Discovery.RpcService.User, &a.userConfig.Share, a.userConfig, user.Start)
|
a.Index(), a.userConfig.Discovery.RpcService.User, &a.userConfig.NotificationConfig, a.userConfig, user.Start)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -610,3 +610,72 @@ func (l *CacheConfig) Success() time.Duration {
|
|||||||
func (l *CacheConfig) Enable() bool {
|
func (l *CacheConfig) Enable() bool {
|
||||||
return l.Topic != "" && l.SlotNum > 0 && l.SlotSize > 0
|
return l.Topic != "" && l.SlotNum > 0 && l.SlotSize > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func InitNotification(notification *Notification) {
|
||||||
|
notification.GroupCreated.UnreadCount = false
|
||||||
|
notification.GroupCreated.ReliabilityLevel = 1
|
||||||
|
notification.GroupInfoSet.UnreadCount = false
|
||||||
|
notification.GroupInfoSet.ReliabilityLevel = 1
|
||||||
|
notification.JoinGroupApplication.UnreadCount = false
|
||||||
|
notification.JoinGroupApplication.ReliabilityLevel = 1
|
||||||
|
notification.MemberQuit.UnreadCount = false
|
||||||
|
notification.MemberQuit.ReliabilityLevel = 1
|
||||||
|
notification.GroupApplicationAccepted.UnreadCount = false
|
||||||
|
notification.GroupApplicationAccepted.ReliabilityLevel = 1
|
||||||
|
notification.GroupApplicationRejected.UnreadCount = false
|
||||||
|
notification.GroupApplicationRejected.ReliabilityLevel = 1
|
||||||
|
notification.GroupOwnerTransferred.UnreadCount = false
|
||||||
|
notification.GroupOwnerTransferred.ReliabilityLevel = 1
|
||||||
|
notification.MemberKicked.UnreadCount = false
|
||||||
|
notification.MemberKicked.ReliabilityLevel = 1
|
||||||
|
notification.MemberInvited.UnreadCount = false
|
||||||
|
notification.MemberInvited.ReliabilityLevel = 1
|
||||||
|
notification.MemberEnter.UnreadCount = false
|
||||||
|
notification.MemberEnter.ReliabilityLevel = 1
|
||||||
|
notification.GroupDismissed.UnreadCount = false
|
||||||
|
notification.GroupDismissed.ReliabilityLevel = 1
|
||||||
|
notification.GroupMuted.UnreadCount = false
|
||||||
|
notification.GroupMuted.ReliabilityLevel = 1
|
||||||
|
notification.GroupCancelMuted.UnreadCount = false
|
||||||
|
notification.GroupCancelMuted.ReliabilityLevel = 1
|
||||||
|
notification.GroupMemberMuted.UnreadCount = false
|
||||||
|
notification.GroupMemberMuted.ReliabilityLevel = 1
|
||||||
|
notification.GroupMemberCancelMuted.UnreadCount = false
|
||||||
|
notification.GroupMemberCancelMuted.ReliabilityLevel = 1
|
||||||
|
notification.GroupMemberInfoSet.UnreadCount = false
|
||||||
|
notification.GroupMemberInfoSet.ReliabilityLevel = 1
|
||||||
|
notification.GroupMemberSetToAdmin.UnreadCount = false
|
||||||
|
notification.GroupMemberSetToAdmin.ReliabilityLevel = 1
|
||||||
|
notification.GroupMemberSetToOrdinary.UnreadCount = false
|
||||||
|
notification.GroupMemberSetToOrdinary.ReliabilityLevel = 1
|
||||||
|
notification.GroupInfoSetAnnouncement.UnreadCount = false
|
||||||
|
notification.GroupInfoSetAnnouncement.ReliabilityLevel = 1
|
||||||
|
notification.GroupInfoSetName.UnreadCount = false
|
||||||
|
notification.GroupInfoSetName.ReliabilityLevel = 1
|
||||||
|
notification.FriendApplicationAdded.UnreadCount = false
|
||||||
|
notification.FriendApplicationAdded.ReliabilityLevel = 1
|
||||||
|
notification.FriendApplicationApproved.UnreadCount = false
|
||||||
|
notification.FriendApplicationApproved.ReliabilityLevel = 1
|
||||||
|
notification.FriendApplicationRejected.UnreadCount = false
|
||||||
|
notification.FriendApplicationRejected.ReliabilityLevel = 1
|
||||||
|
notification.FriendAdded.UnreadCount = false
|
||||||
|
notification.FriendAdded.ReliabilityLevel = 1
|
||||||
|
notification.FriendDeleted.UnreadCount = false
|
||||||
|
notification.FriendDeleted.ReliabilityLevel = 1
|
||||||
|
notification.FriendRemarkSet.UnreadCount = false
|
||||||
|
notification.FriendRemarkSet.ReliabilityLevel = 1
|
||||||
|
notification.BlackAdded.UnreadCount = false
|
||||||
|
notification.BlackAdded.ReliabilityLevel = 1
|
||||||
|
notification.BlackDeleted.UnreadCount = false
|
||||||
|
notification.BlackDeleted.ReliabilityLevel = 1
|
||||||
|
notification.FriendInfoUpdated.UnreadCount = false
|
||||||
|
notification.FriendInfoUpdated.ReliabilityLevel = 1
|
||||||
|
notification.UserInfoUpdated.UnreadCount = false
|
||||||
|
notification.UserInfoUpdated.ReliabilityLevel = 1
|
||||||
|
notification.UserStatusChanged.UnreadCount = false
|
||||||
|
notification.UserStatusChanged.ReliabilityLevel = 1
|
||||||
|
notification.ConversationChanged.UnreadCount = false
|
||||||
|
notification.ConversationChanged.ReliabilityLevel = 1
|
||||||
|
notification.ConversationSetPrivate.UnreadCount = false
|
||||||
|
notification.ConversationSetPrivate.ReliabilityLevel = 1
|
||||||
|
}
|
||||||
|
|||||||
@ -47,8 +47,9 @@ import (
|
|||||||
|
|
||||||
// Start rpc server.
|
// Start rpc server.
|
||||||
func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConfig *conf.Prometheus, listenIP,
|
func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConfig *conf.Prometheus, listenIP,
|
||||||
registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, share *conf.Share, config T, rpcFn func(ctx context.Context,
|
registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, notification *conf.Notification, config T,
|
||||||
config T, client discovery.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {
|
rpcFn func(ctx context.Context, config T, client discovery.SvcDiscoveryRegistry, server *grpc.Server) error,
|
||||||
|
options ...grpc.ServerOption) error {
|
||||||
|
|
||||||
var (
|
var (
|
||||||
rpcTcpAddr string
|
rpcTcpAddr string
|
||||||
@ -57,6 +58,10 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
|
|||||||
prometheusPort int
|
prometheusPort int
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if notification != nil {
|
||||||
|
conf.InitNotification(notification)
|
||||||
|
}
|
||||||
|
|
||||||
registerIP, err := network.GetRpcRegisterIP(registerIP)
|
registerIP, err := network.GetRpcRegisterIP(registerIP)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user