msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

Merge log files

Browse Source
pull/218/head
wenxu12345 3 years ago
parent 60418276bd
commit ecd2f0e2bf
17 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
cmd/Open-IM-SDK-Core

@ -1 +1 @@
Subproject commit 884d0d0b2712f269db3f7f7fc7309759854dcb03 Subproject commit 7b66c0ab78be494ce2cfe23de37543dd11c2d354

3
cmd/open_im_api/main.go
Unescape View File

@ -10,6 +10,7 @@ import (
"Open_IM/internal/api/office" "Open_IM/internal/api/office"
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/constant"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"flag" "flag"
@ -125,7 +126,7 @@ func main() {
officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs) officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs)
} }
apiThird.MinioInit() apiThird.MinioInit()
log.NewPrivateLog("api") 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))

3
cmd/open_im_demo/main.go
Unescape View File

@ -2,6 +2,7 @@ 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/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"flag" "flag"
@ -23,7 +24,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("demo") 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_timer_task/main.go
Unescape View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"Open_IM/pkg/common/constant"
commonDB "Open_IM/pkg/common/db" commonDB "Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
@ -8,7 +9,7 @@ import (
) )
func main() { func main() {
log.NewPrivateLog("timer") log.NewPrivateLog(constant.LogFileName)
//for { //for {
// fmt.Println("start delete mongodb expired record") // fmt.Println("start delete mongodb expired record")
// timeUnixBegin := time.Now().Unix() // timeUnixBegin := time.Now().Unix()

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

@ -2,6 +2,7 @@ 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" "Open_IM/pkg/common/log"
) )
@ -13,7 +14,7 @@ var (
) )
func Init() { func Init() {
log.NewPrivateLog(config.Config.ModuleName.MsgTransferName) 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)

2
internal/push/logic/init.go
Unescape View File

@ -24,7 +24,7 @@ var (
) )
func Init(rpcPort int) { func Init(rpcPort int) {
log.NewPrivateLog(config.Config.ModuleName.PushName) 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}

8
internal/rpc/admin_cms/admin_cms.go
Unescape View File

@ -24,7 +24,7 @@ type adminCMSServer struct {
} }
func NewAdminCMSServer(port int) *adminCMSServer { func NewAdminCMSServer(port int) *adminCMSServer {
log.NewPrivateLog("AdminCMS") log.NewPrivateLog(constant.LogFileName)
return &adminCMSServer{ return &adminCMSServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImAdminCMSName, rpcRegisterName: config.Config.RpcRegisterName.OpenImAdminCMSName,
@ -66,12 +66,12 @@ func (s *adminCMSServer) Run() {
func (s *adminCMSServer) AdminLogin(_ context.Context, req *pbAdminCMS.AdminLoginReq) (*pbAdminCMS.AdminLoginResp, error) { func (s *adminCMSServer) AdminLogin(_ context.Context, req *pbAdminCMS.AdminLoginReq) (*pbAdminCMS.AdminLoginResp, error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp := &pbAdminCMS.AdminLoginResp{} resp := &pbAdminCMS.AdminLoginResp{}
for i, adminID := range config.Config.Manager.AppManagerUid{ for i, adminID := range config.Config.Manager.AppManagerUid {
if adminID == req.AdminID && config.Config.Manager.Secrets[i] == req.Secret { if adminID == req.AdminID && config.Config.Manager.Secrets[i] == req.Secret {
token, expTime, err := token_verify.CreateToken(adminID, constant.SingleChatType) token, expTime, err := token_verify.CreateToken(adminID, constant.SingleChatType)
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "generate token success", "token: ", token, "expTime:", expTime) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "generate token success", "token: ", token, "expTime:", expTime)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "generate token failed", "adminID: ", adminID, err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "generate token failed", "adminID: ", adminID, err.Error())
return resp, openIMHttp.WrapError(constant.ErrTokenUnknown) return resp, openIMHttp.WrapError(constant.ErrTokenUnknown)
} }
resp.Token = token resp.Token = token
@ -84,4 +84,4 @@ func (s *adminCMSServer) AdminLogin(_ context.Context, req *pbAdminCMS.AdminLogi
return resp, openIMHttp.WrapError(constant.ErrTokenMalformed) return resp, openIMHttp.WrapError(constant.ErrTokenMalformed)
} }
return resp, nil return resp, nil
} }

2
internal/rpc/auth/auth.go
Unescape View File

@ -63,7 +63,7 @@ type rpcAuth struct {
} }
func NewRpcAuthServer(port int) *rpcAuth { func NewRpcAuthServer(port int) *rpcAuth {
log.NewPrivateLog("auth") log.NewPrivateLog(constant.LogFileName)
return &rpcAuth{ return &rpcAuth{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImAuthName, rpcRegisterName: config.Config.RpcRegisterName.OpenImAuthName,

2
internal/rpc/friend/firend.go
Unescape View File

@ -29,7 +29,7 @@ type friendServer struct {
} }
func NewFriendServer(port int) *friendServer { func NewFriendServer(port int) *friendServer {
log.NewPrivateLog("friend") log.NewPrivateLog(constant.LogFileName)
return &friendServer{ return &friendServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImFriendName, rpcRegisterName: config.Config.RpcRegisterName.OpenImFriendName,

2
internal/rpc/group/group.go
Unescape View File

@ -31,7 +31,7 @@ type groupServer struct {
} }
func NewGroupServer(port int) *groupServer { func NewGroupServer(port int) *groupServer {
log.NewPrivateLog("group") log.NewPrivateLog(constant.LogFileName)
return &groupServer{ return &groupServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImGroupName, rpcRegisterName: config.Config.RpcRegisterName.OpenImGroupName,

20
internal/rpc/message_cms/message_cms.go
Unescape View File

@ -31,7 +31,7 @@ type messageCMSServer struct {
} }
func NewMessageCMSServer(port int) *messageCMSServer { func NewMessageCMSServer(port int) *messageCMSServer {
log.NewPrivateLog("MessageCMS") log.NewPrivateLog(constant.LogFileName)
return &messageCMSServer{ return &messageCMSServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImMessageCMSName, rpcRegisterName: config.Config.RpcRegisterName.OpenImMessageCMSName,
@ -84,8 +84,8 @@ func (s *messageCMSServer) GetChatLogs(_ context.Context, req *pbMessageCMS.GetC
log.NewError(req.OperationID, utils.GetSelfFuncName(), "time string parse error", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "time string parse error", err.Error())
} }
chatLog := db.ChatLog{ chatLog := db.ChatLog{
Content: req.Content, Content: req.Content,
SendTime: time, SendTime: time,
ContentType: req.ContentType, ContentType: req.ContentType,
SessionType: req.SessionType, SessionType: req.SessionType,
} }
@ -101,20 +101,20 @@ func (s *messageCMSServer) GetChatLogs(_ context.Context, req *pbMessageCMS.GetC
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLogCount", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLogCount", err.Error())
} }
chatLogs, err := imdb.GetChatLog(chatLog, req.Pagination.PageNumber, req.Pagination.ShowNumber) chatLogs, err := imdb.GetChatLog(chatLog, req.Pagination.PageNumber, req.Pagination.ShowNumber)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLog", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLog", err.Error())
return resp, errors.WrapError(constant.ErrDB) return resp, errors.WrapError(constant.ErrDB)
} }
for _, chatLog := range chatLogs { for _, chatLog := range chatLogs {
pbChatLog := &pbMessageCMS.ChatLogs{ pbChatLog := &pbMessageCMS.ChatLogs{
SessionType: chatLog.SessionType, SessionType: chatLog.SessionType,
ContentType: chatLog.ContentType, ContentType: chatLog.ContentType,
SearchContent: req.Content, SearchContent: req.Content,
WholeContent: chatLog.Content, WholeContent: chatLog.Content,
Date: chatLog.CreateTime.String(), Date: chatLog.CreateTime.String(),
SenderNickName: chatLog.SenderNickname, SenderNickName: chatLog.SenderNickname,
SenderId: chatLog.SendID, SenderId: chatLog.SendID,
} }
if chatLog.SenderNickname == "" { if chatLog.SenderNickname == "" {
sendUser, err := imdb.GetUserByUserID(chatLog.SendID) sendUser, err := imdb.GetUserByUserID(chatLog.SendID)

3
internal/rpc/msg/rpcChat.go
Unescape View File

@ -2,6 +2,7 @@ package msg
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" "Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3" "Open_IM/pkg/grpc-etcdv3/getcdv3"
@ -22,7 +23,7 @@ type rpcChat struct {
} }
func NewRpcChatServer(port int) *rpcChat { func NewRpcChatServer(port int) *rpcChat {
log.NewPrivateLog("msg") log.NewPrivateLog(constant.LogFileName)
rc := rpcChat{ rc := rpcChat{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImOfflineMessageName, rpcRegisterName: config.Config.RpcRegisterName.OpenImOfflineMessageName,

2
internal/rpc/office/office.go
Unescape View File

@ -26,7 +26,7 @@ type officeServer struct {
} }
func NewOfficeServer(port int) *officeServer { func NewOfficeServer(port int) *officeServer {
log.NewPrivateLog("office") log.NewPrivateLog(constant.LogFileName)
return &officeServer{ return &officeServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImOfficeName, rpcRegisterName: config.Config.RpcRegisterName.OpenImOfficeName,

8
internal/rpc/statistics/statistics.go
Unescape View File

@ -19,10 +19,10 @@ import (
//open_im_sdk "Open_IM/pkg/proto/sdk_ws" //open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
//"context" //"context"
errors "Open_IM/pkg/common/http"
"net" "net"
"strconv" "strconv"
"strings" "strings"
errors "Open_IM/pkg/common/http"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@ -35,7 +35,7 @@ type statisticsServer struct {
} }
func NewStatisticsServer(port int) *statisticsServer { func NewStatisticsServer(port int) *statisticsServer {
log.NewPrivateLog("Statistics") log.NewPrivateLog(constant.LogFileName)
return &statisticsServer{ return &statisticsServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImStatisticsName, rpcRegisterName: config.Config.RpcRegisterName.OpenImStatisticsName,
@ -164,7 +164,7 @@ func GetRangeDate(from, to time.Time) [][2]time.Time {
} }
// month // month
case !isInOneMonth(from, to): case !isInOneMonth(from, to):
if to.Sub(from) < time.Hour * 24 * 30 { if to.Sub(from) < time.Hour*24*30 {
for i := 0; ; i++ { for i := 0; ; i++ {
fromTime := from.Add(time.Hour * 24 * time.Duration(i)) fromTime := from.Add(time.Hour * 24 * time.Duration(i))
toTime := from.Add(time.Hour * 24 * time.Duration(i+1)) toTime := from.Add(time.Hour * 24 * time.Duration(i+1))
@ -251,7 +251,7 @@ func (s *statisticsServer) GetGroupStatistics(_ context.Context, req *pbStatisti
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
} }
resp.TotalGroupNumList[index] = &pbStatistics.DateNumList{ resp.TotalGroupNumList[index] = &pbStatistics.DateNumList{
Date: v[0].String(), Date: v[0].String(),
Num: num, Num: num,
} }
}(wg, i, v) }(wg, i, v)

2
internal/rpc/user/user.go
Unescape View File

@ -32,7 +32,7 @@ type userServer struct {
} }
func NewUserServer(port int) *userServer { func NewUserServer(port int) *userServer {
log.NewPrivateLog("user") log.NewPrivateLog(constant.LogFileName)
return &userServer{ return &userServer{
rpcPort: port, rpcPort: port,
rpcRegisterName: config.Config.RpcRegisterName.OpenImUserName, rpcRegisterName: config.Config.RpcRegisterName.OpenImUserName,

2
pkg/common/constant/constant.go
Unescape View File

@ -230,3 +230,5 @@ func GroupIsBanPrivateChat(status int32) bool {
} }
const BigVersion = "v3" const BigVersion = "v3"
const LogFileName = "OpenIM.log"

8
pkg/common/log/logrus.go
Unescape View File

@ -63,10 +63,10 @@ func loggerInit(moduleName string) *Logger {
} }
func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string) logrus.Hook { func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string) logrus.Hook {
lfsHook := lfshook.NewHook(lfshook.WriterMap{ lfsHook := lfshook.NewHook(lfshook.WriterMap{
logrus.DebugLevel: initRotateLogs(rotationTime, maxRemainNum, "debug", moduleName), logrus.DebugLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
logrus.InfoLevel: initRotateLogs(rotationTime, maxRemainNum, "info", moduleName), logrus.InfoLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
logrus.WarnLevel: initRotateLogs(rotationTime, maxRemainNum, "warn", moduleName), logrus.WarnLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
logrus.ErrorLevel: initRotateLogs(rotationTime, maxRemainNum, "error", moduleName), logrus.ErrorLevel: initRotateLogs(rotationTime, maxRemainNum, "all", moduleName),
}, &nested.Formatter{ }, &nested.Formatter{
TimestampFormat: "2006-01-02 15:04:05.000", TimestampFormat: "2006-01-02 15:04:05.000",
HideKeys: false, HideKeys: false,

Write Preview
Loading…
Cancel
Save