IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-14 22:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
This commit is contained in:
wangchuxiao
2023-02-09 14:49:17 +08:00
parent 414915eb3b 2f7b65730a
commit 1075754458
19 changed files with 1776 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/group/group.go
+7 -13
View File
@@ -21,7 +21,6 @@ import (
"Open_IM/pkg/utils"
"context"
"fmt"
"github.com/OpenIMSDK/getcdv3"
grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"math/big"
"net"
@@ -67,7 +66,7 @@ func NewGroupServer(port int) *groupServer {
if err != nil {
panic(err.Error())
}
registerIP, err := network.GetRpcIP(config.Config.RpcRegisterIP)
registerIP, err := network.GetRpcRegisterIP(config.Config.RpcRegisterIP)
g.registerCenter = zkClient
err = g.registerCenter.Register(config.Config.RpcRegisterName.OpenImGroupName, registerIP, port)
if err != nil {
@@ -81,20 +80,15 @@ func NewGroupServer(port int) *groupServer {
}
func (s *groupServer) Run() {
log.NewInfo("", "group rpc start ")
listenIP := ""
if config.Config.ListenIP == "" {
listenIP = "0.0.0.0"
} else {
listenIP = config.Config.ListenIP
}
address := listenIP + ":" + strconv.Itoa(s.rpcPort)
operationID := utils.OperationIDGenerator()
log.NewInfo(operationID, "group rpc start ")
address := network.GetListenIP(config.Config.ListenIP) + ":" + strconv.Itoa(s.rpcPort)
//listener network
listener, err := net.Listen("tcp", address)
if err != nil {
panic("listening err:" + err.Error() + s.rpcRegisterName)
}
log.NewInfo("", "listen network success, ", address, listener)
log.NewInfo(operationID, "listen network success, ", address, listener)
defer listener.Close()
//grpc server
@@ -121,10 +115,10 @@ func (s *groupServer) Run() {
pbGroup.RegisterGroupServer(srv, s)
err = srv.Serve(listener)
if err != nil {
log.NewError("", "Serve failed ", err.Error())
log.NewError(operationID, "Serve failed ", err.Error())
return
}
log.NewInfo("", "group rpc success")
log.NewInfo(operationID, "group rpc success")
}
func (s *groupServer) CheckGroupAdmin(ctx context.Context, groupID string) error {