blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-09-02 04:59:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup

Browse Source
This commit is contained in:
wangchuxiao 2022-06-17 10:45:00 +08:00
commit e64b8841c5
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yaml
View File

@ -75,7 +75,7 @@ services:
TZ: Asia/Shanghai TZ: Asia/Shanghai
KAFKA_BROKER_ID: 0 KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181
KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:2:1,msg_to_mongo:2:1" KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1"
KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093
KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT"

3
internal/msg_transfer/logic/init.go
View File

@ -38,6 +38,7 @@ func Init() {
w = new(sync.Mutex) w = new(sync.Mutex)
persistentCH.Init() persistentCH.Init()
historyCH.Init(cmdCh) historyCH.Init(cmdCh)
historyMongoCH.Init()
onlineTopicStatus = OnlineTopicVacancy onlineTopicStatus = OnlineTopicVacancy
//offlineHistoryCH.Init(cmdCh) //offlineHistoryCH.Init(cmdCh)
statistics.NewStatistics(&singleMsgSuccessCount, config.Config.ModuleName.MsgTransferName, fmt.Sprintf("%d second singleMsgCount insert to mongo", constant.StatisticsTimeInterval), constant.StatisticsTimeInterval) statistics.NewStatistics(&singleMsgSuccessCount, config.Config.ModuleName.MsgTransferName, fmt.Sprintf("%d second singleMsgCount insert to mongo", constant.StatisticsTimeInterval), constant.StatisticsTimeInterval)
@ -53,7 +54,7 @@ func Run() {
fmt.Println("not start mysql consumer") fmt.Println("not start mysql consumer")
} }
go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH) go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH)
//go historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyMongoCH) go historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyMongoCH)
//go offlineHistoryCH.historyConsumerGroup.RegisterHandleAndConsumer(&offlineHistoryCH) //go offlineHistoryCH.historyConsumerGroup.RegisterHandleAndConsumer(&offlineHistoryCH)
} }
func SetOnlineTopicStatus(status int) { func SetOnlineTopicStatus(status int) {

2
internal/msg_transfer/logic/online_msg_to_mongo_handler.go
View File

@ -18,7 +18,7 @@ type OnlineHistoryMongoConsumerHandler struct {
historyConsumerGroup *kfk.MConsumerGroup historyConsumerGroup *kfk.MConsumerGroup
} }
func (och *OnlineHistoryMongoConsumerHandler) Init(cmdCh chan Cmd2Value) { func (och *OnlineHistoryMongoConsumerHandler) Init() {
och.msgHandle = make(map[string]fcb) och.msgHandle = make(map[string]fcb)
och.msgHandle[config.Config.Kafka.MsgToMongo.Topic] = och.handleChatWs2Mongo och.msgHandle[config.Config.Kafka.MsgToMongo.Topic] = och.handleChatWs2Mongo
och.historyConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0, och.historyConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,

5
internal/rpc/msg/group_notification.go
View File

@ -101,7 +101,7 @@ func setPublicUserInfo(userID string, publicUserInfo *open_im_sdk.PublicUserInfo
} }
func groupNotification(contentType int32, m proto.Message, sendID, groupID, recvUserID, operationID string) { func groupNotification(contentType int32, m proto.Message, sendID, groupID, recvUserID, operationID string) {
log.Info(operationID, utils.GetSelfFuncName(), "args: ", contentType) log.Info(operationID, utils.GetSelfFuncName(), "args: ", contentType, sendID, groupID, recvUserID)
var err error var err error
var tips open_im_sdk.TipsComm var tips open_im_sdk.TipsComm
@ -126,10 +126,9 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv
if from != nil { if from != nil {
nickname = from.Nickname nickname = from.Nickname
} }
to, err := imdb.GetUserByUserID(recvUserID) to, err := imdb.GetUserByUserID(recvUserID)
if err != nil { if err != nil {
log.Error(operationID, "GetUserByUserID failed ", err.Error(), recvUserID) log.NewWarn(operationID, "GetUserByUserID failed ", err.Error(), recvUserID)
} }
toNickname := "" toNickname := ""
if to != nil { if to != nil {

23
pkg/grpc-etcdv3/getcdv3/register.go
View File

@ -2,6 +2,7 @@ package getcdv3
import ( import (
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
"context" "context"
"fmt" "fmt"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
@ -38,12 +39,15 @@ func RegisterEtcd4Unique(schema, etcdAddr, myHost string, myPort int, serviceNam
//etcdAddr separated by commas //etcdAddr separated by commas
func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName string, ttl int) error { func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName string, ttl int) error {
operationID := utils.OperationIDGenerator()
args := schema + " " + etcdAddr + " " + myHost + " " + serviceName + " " + utils.Int32ToString(int32(myPort))
ttl = ttl * 3 ttl = ttl * 3
cli, err := clientv3.New(clientv3.Config{ cli, err := clientv3.New(clientv3.Config{
Endpoints: strings.Split(etcdAddr, ","), DialTimeout: 5 * time.Second}) Endpoints: strings.Split(etcdAddr, ","), DialTimeout: 5 * time.Second})
log.Info("", "RegisterEtcd, ", schema, etcdAddr, myHost, myPort, serviceName, ttl) log.Info(operationID, "RegisterEtcd args: ", args, ttl)
if err != nil { if err != nil {
log.Error(operationID, "clientv3.New failed ", args, ttl, err.Error())
return fmt.Errorf("create etcd clientv3 client failed, errmsg:%v, etcd addr:%s", err, etcdAddr) return fmt.Errorf("create etcd clientv3 client failed, errmsg:%v, etcd addr:%s", err, etcdAddr)
} }
@ -51,8 +55,10 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
resp, err := cli.Grant(ctx, int64(ttl)) resp, err := cli.Grant(ctx, int64(ttl))
if err != nil { if err != nil {
log.Error(operationID, "Grant failed ", err.Error(), ctx, ttl)
return fmt.Errorf("grant failed") return fmt.Errorf("grant failed")
} }
log.Info(operationID, "Grant ok, resp ID ", resp.ID)
// schema:///serviceName/ip:port ->ip:port // schema:///serviceName/ip:port ->ip:port
serviceValue := net.JoinHostPort(myHost, strconv.Itoa(myPort)) serviceValue := net.JoinHostPort(myHost, strconv.Itoa(myPort))
@ -60,24 +66,26 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin
//set key->value //set key->value
if _, err := cli.Put(ctx, serviceKey, serviceValue, clientv3.WithLease(resp.ID)); err != nil { if _, err := cli.Put(ctx, serviceKey, serviceValue, clientv3.WithLease(resp.ID)); err != nil {
log.Error(operationID, "cli.Put failed ", err.Error(), ctx, args, resp.ID)
return fmt.Errorf("put failed, errmsg:%v， key:%s, value:%s", err, serviceKey, serviceValue) return fmt.Errorf("put failed, errmsg:%v， key:%s, value:%s", err, serviceKey, serviceValue)
} }
//keepalive //keepalive
kresp, err := cli.KeepAlive(ctx, resp.ID) kresp, err := cli.KeepAlive(ctx, resp.ID)
if err != nil { if err != nil {
log.Error(operationID, "KeepAlive failed ", err.Error(), args, resp.ID)
return fmt.Errorf("keepalive failed, errmsg:%v, lease id:%d", err, resp.ID) return fmt.Errorf("keepalive failed, errmsg:%v, lease id:%d", err, resp.ID)
} }
//log.Info("", "RegisterEtcd ok ") log.Info(operationID, "RegisterEtcd ok ", args)
go func() { go func() {
for { for {
select { select {
case pv, ok := <-kresp: case pv, ok := <-kresp:
if ok == true { if ok == true {
log.Debug("", "KeepAlive kresp ok", pv) log.Debug(operationID, "KeepAlive kresp ok", pv)
} else { } else {
log.Error("", "KeepAlive kresp failed", pv) log.Error(operationID, "KeepAlive kresp failed", pv)
t := time.NewTicker(time.Duration(ttl/2) * time.Second) t := time.NewTicker(time.Duration(ttl/2) * time.Second)
for { for {
select { select {
@ -86,17 +94,16 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin
ctx, _ := context.WithCancel(context.Background()) ctx, _ := context.WithCancel(context.Background())
resp, err := cli.Grant(ctx, int64(ttl)) resp, err := cli.Grant(ctx, int64(ttl))
if err != nil { if err != nil {
log.Error("", "Grant failed ", err.Error()) log.Error(operationID, "Grant failed ", err.Error())
continue continue
} }
if _, err := cli.Put(ctx, serviceKey, serviceValue, clientv3.WithLease(resp.ID)); err != nil { if _, err := cli.Put(ctx, serviceKey, serviceValue, clientv3.WithLease(resp.ID)); err != nil {
log.Error("", "etcd Put failed ", err.Error(), serviceKey, serviceValue, resp.ID) log.Error(operationID, "etcd Put failed ", err.Error(), args, "resp ID: ", resp.ID)
continue continue
} else { } else {
log.Info("", "etcd Put ok", serviceKey, serviceValue, resp.ID) log.Info(operationID, "etcd Put ok ", args, "resp ID: ", resp.ID)
} }
} }
} }
} }