blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 18:36:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
Gordon 2022-04-05 20:10:35 +08:00
commit 83228d8aa6
13 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Open-IM-SDK-Core

@ -1 +1 @@
Subproject commit e2b32de2f93ff46662104833c8de5d5b44a2f25d Subproject commit 2257ac8ee528fb1e0038f85e34c8770fbe4758e3

7
cmd/open_im_api/main.go
View File

@ -11,7 +11,6 @@ import (
apiThird "Open_IM/internal/api/third" apiThird "Open_IM/internal/api/third"
"Open_IM/internal/api/user" "Open_IM/internal/api/user"
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"flag" "flag"
@ -21,10 +20,11 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
//"syscall" //"syscall"
"Open_IM/pkg/common/constant"
) )
func main() { func main() {
log.NewPrivateLog(constant.LogFileName)
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
f, _ := os.Create("../logs/api.log") f, _ := os.Create("../logs/api.log")
gin.DefaultWriter = io.MultiWriter(f) gin.DefaultWriter = io.MultiWriter(f)
@ -135,8 +135,7 @@ func main() {
officeGroup.POST("/send_msg_to_tag", office.SendMsg2Tag) officeGroup.POST("/send_msg_to_tag", office.SendMsg2Tag)
officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs) officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs)
} }
apiThird.MinioInit() go apiThird.MinioInit()
log.NewPrivateLog(constant.LogFileName)
ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port") ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port")
flag.Parse() flag.Parse()
r.Run(":" + strconv.Itoa(*ginPort)) r.Run(":" + strconv.Itoa(*ginPort))

7
cmd/open_im_demo/main.go
View File

@ -2,18 +2,19 @@ package main
import ( import (
"Open_IM/internal/demo/register" "Open_IM/internal/demo/register"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"flag" "flag"
"io" "io"
"os" "os"
"strconv" "strconv"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func main() { func main() {
log.NewPrivateLog(constant.LogFileName)
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
f, _ := os.Create("../logs/api.log") f, _ := os.Create("../logs/api.log")
gin.DefaultWriter = io.MultiWriter(f) gin.DefaultWriter = io.MultiWriter(f)
@ -29,7 +30,7 @@ func main() {
authRouterGroup.POST("/login", register.Login) authRouterGroup.POST("/login", register.Login)
authRouterGroup.POST("/reset_password", register.ResetPassword) authRouterGroup.POST("/reset_password", register.ResetPassword)
} }
log.NewPrivateLog(constant.LogFileName)
ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port") ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port")
flag.Parse() flag.Parse()
r.Run(":" + strconv.Itoa(*ginPort)) r.Run(":" + strconv.Itoa(*ginPort))

3
cmd/open_im_msg_gateway/main.go
View File

@ -2,11 +2,14 @@ package main
import ( import (
"Open_IM/internal/msg_gateway/gate" "Open_IM/internal/msg_gateway/gate"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"flag" "flag"
"sync" "sync"
) )
func main() { func main() {
log.NewPrivateLog(constant.LogFileName)
rpcPort := flag.Int("rpc_port", 10400, "rpc listening port") rpcPort := flag.Int("rpc_port", 10400, "rpc listening port")
wsPort := flag.Int("ws_port", 17778, "ws listening port") wsPort := flag.Int("ws_port", 17778, "ws listening port")
flag.Parse() flag.Parse()

3
cmd/open_im_msg_transfer/main.go
View File

@ -2,12 +2,15 @@ package main
import ( import (
"Open_IM/internal/msg_transfer/logic" "Open_IM/internal/msg_transfer/logic"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"sync" "sync"
) )
func main() { func main() {
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
log.NewPrivateLog(constant.LogFileName)
logic.Init() logic.Init()
logic.Run() logic.Run()
wg.Wait() wg.Wait()

3
cmd/open_im_push/main.go
View File

@ -2,6 +2,8 @@ package main
import ( import (
"Open_IM/internal/push/logic" "Open_IM/internal/push/logic"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"flag" "flag"
"sync" "sync"
) )
@ -11,6 +13,7 @@ func main() {
flag.Parse() flag.Parse()
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
log.NewPrivateLog(constant.LogFileName)
logic.Init(*rpcPort) logic.Init(*rpcPort)
logic.Run() logic.Run()
wg.Wait() wg.Wait()

47
cmd/open_im_timer_task/main.go
View File

@ -2,10 +2,7 @@ package main
import ( import (
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
commonDB "Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"time"
) )
func main() { func main() {
@ -40,27 +37,27 @@ func main() {
// time.Sleep(time.Duration(sleepTime) * time.Second) // time.Sleep(time.Duration(sleepTime) * time.Second)
// } // }
//} //}
for { //for {
uidList, err := im_mysql_model.SelectAllUserID() // uidList, err := im_mysql_model.SelectAllUserID()
if err != nil { // if err != nil {
//log.NewError("999999", err.Error()) // //log.NewError("999999", err.Error())
} else { // } else {
for _, v := range uidList { // for _, v := range uidList {
minSeq, err := commonDB.DB.GetMinSeqFromMongo(v) // minSeq, err := commonDB.DB.GetMinSeqFromMongo(v)
if err != nil { // if err != nil {
//log.NewError("999999", "get user minSeq err", err.Error(), v) // //log.NewError("999999", "get user minSeq err", err.Error(), v)
continue // continue
} else { // } else {
err := commonDB.DB.SetUserMinSeq(v, minSeq) // err := commonDB.DB.SetUserMinSeq(v, minSeq)
if err != nil { // if err != nil {
//log.NewError("999999", "set user minSeq err", err.Error(), v) // //log.NewError("999999", "set user minSeq err", err.Error(), v)
} // }
} // }
time.Sleep(time.Duration(100) * time.Millisecond) // time.Sleep(time.Duration(100) * time.Millisecond)
} // }
//
} // }
//
} //}
} }

19
internal/api/third/minio_init.go
View File

@ -15,18 +15,21 @@ var (
) )
func MinioInit() { func MinioInit() {
log.NewInfo("", utils.GetSelfFuncName()) operationID := utils.OperationIDGenerator()
log.NewInfo(operationID, utils.GetSelfFuncName(), "minio config: ", config.Config.Credential.Minio)
minioUrl, err := url2.Parse(config.Config.Credential.Minio.Endpoint) minioUrl, err := url2.Parse(config.Config.Credential.Minio.Endpoint)
if err != nil { if err != nil {
log.NewError("", utils.GetSelfFuncName(), "parse failed, please check config/config.yaml", err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), "parse failed, please check config/config.yaml", err.Error())
return return
} }
log.NewInfo(operationID, utils.GetSelfFuncName(), "Parse ok ", config.Config.Credential.Minio)
minioClient, err = minio.New(minioUrl.Host, &minio.Options{ minioClient, err = minio.New(minioUrl.Host, &minio.Options{
Creds: credentials.NewStaticV4(config.Config.Credential.Minio.AccessKeyID, config.Config.Credential.Minio.SecretAccessKey, ""), Creds: credentials.NewStaticV4(config.Config.Credential.Minio.AccessKeyID, config.Config.Credential.Minio.SecretAccessKey, ""),
Secure: false, Secure: false,
}) })
log.NewInfo(operationID, utils.GetSelfFuncName(), "new ok ", config.Config.Credential.Minio)
if err != nil { if err != nil {
log.NewError("", utils.GetSelfFuncName(), "init minio client failed", err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), "init minio client failed", err.Error())
return return
} }
opt := minio.MakeBucketOptions{ opt := minio.MakeBucketOptions{
@ -35,15 +38,15 @@ func MinioInit() {
} }
err = minioClient.MakeBucket(context.Background(), config.Config.Credential.Minio.Bucket, opt) err = minioClient.MakeBucket(context.Background(), config.Config.Credential.Minio.Bucket, opt)
if err != nil { if err != nil {
log.NewInfo("", utils.GetSelfFuncName(), err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), "MakeBucket failed ", err.Error())
exists, err := minioClient.BucketExists(context.Background(), config.Config.Credential.Minio.Bucket) exists, err := minioClient.BucketExists(context.Background(), config.Config.Credential.Minio.Bucket)
if err == nil && exists { if err == nil && exists {
log.NewInfo("", utils.GetSelfFuncName(), "We already own %s\n", config.Config.Credential.Minio.Bucket) log.NewWarn(operationID, utils.GetSelfFuncName(), "We already own ", config.Config.Credential.Minio.Bucket)
} else { } else {
if err != nil { if err != nil {
log.NewError("", utils.GetSelfFuncName(), err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
} }
log.NewError("", utils.GetSelfFuncName(), "create bucket failed and bucket not exists") log.NewError(operationID, utils.GetSelfFuncName(), "create bucket failed and bucket not exists")
return return
} }
} }
@ -53,5 +56,5 @@ func MinioInit() {
// log.NewError("", utils.GetSelfFuncName(), "SetBucketPolicy failed please set in web", err.Error()) // log.NewError("", utils.GetSelfFuncName(), "SetBucketPolicy failed please set in web", err.Error())
// return // return
//} //}
log.NewInfo("", utils.GetSelfFuncName(), "minio create and set policy success") log.NewInfo(operationID, utils.GetSelfFuncName(), "minio create and set policy success")
} }

5
internal/msg_gateway/gate/init.go
View File

@ -2,8 +2,7 @@ package gate
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"Open_IM/pkg/statistics" "Open_IM/pkg/statistics"
"fmt" "fmt"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
@ -21,7 +20,7 @@ var (
func Init(rpcPort, wsPort int) { func Init(rpcPort, wsPort int) {
//log initialization //log initialization
log.NewPrivateLog(constant.LogFileName)
rwLock = new(sync.RWMutex) rwLock = new(sync.RWMutex)
validate = validator.New() validate = validator.New()
statistics.NewStatistics(&sendMsgCount, config.Config.ModuleName.LongConnSvrName, fmt.Sprintf("%d second recv to msg_gateway sendMsgCount", sendMsgCount), 300) statistics.NewStatistics(&sendMsgCount, config.Config.ModuleName.LongConnSvrName, fmt.Sprintf("%d second recv to msg_gateway sendMsgCount", sendMsgCount), 300)

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

@ -2,9 +2,8 @@ package logic
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/kafka" "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
) )
var ( var (
@ -14,7 +13,7 @@ var (
) )
func Init() { func Init() {
log.NewPrivateLog(constant.LogFileName)
persistentCH.Init() persistentCH.Init()
historyCH.Init() historyCH.Init()
producer = kafka.NewKafkaProducer(config.Config.Kafka.Ms2pschat.Addr, config.Config.Kafka.Ms2pschat.Topic) producer = kafka.NewKafkaProducer(config.Config.Kafka.Ms2pschat.Addr, config.Config.Kafka.Ms2pschat.Topic)

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

@ -10,7 +10,6 @@ import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/kafka" "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
"Open_IM/pkg/statistics" "Open_IM/pkg/statistics"
"fmt" "fmt"
) )
@ -24,7 +23,7 @@ var (
) )
func Init(rpcPort int) { func Init(rpcPort int) {
log.NewPrivateLog(constant.LogFileName)
rpcServer.Init(rpcPort) rpcServer.Init(rpcPort)
pushCh.Init() pushCh.Init()
pushTerminal = []int32{constant.IOSPlatformID, constant.AndroidPlatformID} pushTerminal = []int32{constant.IOSPlatformID, constant.AndroidPlatformID}

2
internal/rpc/msg/rpcChat.go
View File

@ -43,7 +43,7 @@ func (rpc *rpcChat) Run() {
log.Error("", "", "listen network failed, err = %s, address = %s", err.Error(), address) log.Error("", "", "listen network failed, err = %s, address = %s", err.Error(), address)
return return
} }
log.Info("", "", "listen network success, address = %s", address) log.Info("", "", "listen network success, address = ", address)
//grpc server //grpc server
srv := grpc.NewServer() srv := grpc.NewServer()

12
pkg/common/db/model.go
View File

@ -2,8 +2,7 @@ package db
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" //"Open_IM/pkg/common/log"
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"fmt" "fmt"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
@ -34,7 +33,7 @@ func key(dbAddress, dbName string) string {
} }
func init() { func init() {
log.NewPrivateLog(constant.LogFileName) //log.NewPrivateLog(constant.LogFileName)
//var mgoSession *mgo.Session //var mgoSession *mgo.Session
var mongoClient *mongo.Client var mongoClient *mongo.Client
var err1 error var err1 error
@ -54,15 +53,16 @@ func init() {
mongoClient, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(uri)) mongoClient, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))
if err != nil { if err != nil {
log.NewError(" mongo.Connect failed, try ", utils.GetSelfFuncName(), err.Error(), uri) fmt.Println(" mongo.Connect failed, try ", utils.GetSelfFuncName(), err.Error(), uri)
time.Sleep(time.Duration(30) * time.Second) time.Sleep(time.Duration(30) * time.Second)
mongoClient, err1 = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri)) mongoClient, err1 = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))
if err1 != nil { if err1 != nil {
log.NewError(" mongo.Connect retry failed, panic", err.Error(), uri) fmt.Println(" mongo.Connect retry failed, panic", err.Error(), uri)
panic(err1.Error()) panic(err1.Error())
} }
} }
log.NewInfo("0", utils.GetSelfFuncName(), "mongo driver client init success") fmt.Println("0", utils.GetSelfFuncName(), "mongo driver client init success")
DB.mongoClient = mongoClient DB.mongoClient = mongoClient
//mgoDailInfo := &mgo.DialInfo{ //mgoDailInfo := &mgo.DialInfo{