From 9fbfbfb23bf54bfc966c5c63acfc2789d2d4e433 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Thu, 31 Mar 2022 11:28:51 +0800 Subject: [PATCH] Merge log files --- internal/msg_gateway/gate/init.go | 3 ++- pkg/common/db/model.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/msg_gateway/gate/init.go b/internal/msg_gateway/gate/init.go index b827f9928..e62338d14 100644 --- a/internal/msg_gateway/gate/init.go +++ b/internal/msg_gateway/gate/init.go @@ -2,6 +2,7 @@ package gate import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/statistics" "fmt" @@ -20,7 +21,7 @@ var ( func Init(rpcPort, wsPort int) { //log initialization - log.NewPrivateLog(config.Config.ModuleName.LongConnSvrName) + log.NewPrivateLog(constant.LogFileName) rwLock = new(sync.RWMutex) validate = validator.New() statistics.NewStatistics(&sendMsgCount, config.Config.ModuleName.LongConnSvrName, fmt.Sprintf("%d second recv to msg_gateway sendMsgCount", sendMsgCount), 300) diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go index 812783e03..21dae1667 100644 --- a/pkg/common/db/model.go +++ b/pkg/common/db/model.go @@ -2,6 +2,7 @@ package db import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/utils" "fmt" @@ -33,6 +34,7 @@ func key(dbAddress, dbName string) string { } func init() { + log.NewPrivateLog(constant.LogFileName) //var mgoSession *mgo.Session var mongoClient *mongo.Client var err1 error @@ -51,7 +53,7 @@ func init() { } 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) time.Sleep(time.Duration(30) * time.Second) mongoClient, err1 = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri))