Merge branch 'main' into count

# Conflicts:
#	go.mod
#	go.sum

config/log.yml

@@ -1,9 +1,15 @@
 # Log storage path, default is acceptable, change to a full path if modification is needed
 storageLocation: ../../../../logs/
 # Log rotation period (in hours), default is acceptable
-rotationTime: 24
+rotationTime: 1
-# Number of log files to retain, default is acceptable
+# Maximum size of each log file (in MB), default is acceptable, it means unlimited
-remainRotationCount: 2
+maxSize: 0
+# Number of log files to retain, default is acceptable, it means whenever the log file is rotated, the old log file will be deleted
+maxBackups: 10
+# Old log retain time (in days), default is acceptable, it means unlimited
+maxAge: 10
+# Whether compress old log files.
+compress: false
 # Log level settings: 3 for production environment; 6 for more verbose logging in debugging environments
 remainLogLevel: 6
 # Whether to output to standard output, default is acceptable

go.mod

@@ -11,10 +11,9 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openimsdk/protocol v0.0.69-alpha.24
-	github.com/openimsdk/tools v0.0.49-alpha.41
+	github.com/openimsdk/tools v0.0.49-alpha.45
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0
@@ -161,6 +160,7 @@ require (
 	google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gorm.io/gorm v1.25.8 // indirect
 	stathat.com/c/consistent v1.0.0 // indirect
 )
@@ -168,7 +168,6 @@ require (
 require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/lestrrat-go/strftime v1.0.6 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/spf13/cobra v1.8.0
 	github.com/ugorji/go/codec v1.2.11 // indirect
@@ -176,7 +175,3 @@ require (
 	golang.org/x/crypto v0.21.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
-
-//replace (
-//	github.com/openimsdk/tools => /Users/chao/Desktop/withchao/tools
-//)

go.sum

@@ -270,10 +270,10 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.69-alpha.24 h1:TYcNJeWOTuE40UQ54eNPdDdy0KTOh9rAOgax8lCyhDc=
+github.com/openimsdk/protocol v0.0.69-alpha.17 h1:pEag4ZdlovE+AyLsw1VYFU/3sk6ayvGdPzgufQfKf9M=
-github.com/openimsdk/protocol v0.0.69-alpha.24/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.69-alpha.17/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
-github.com/openimsdk/tools v0.0.49-alpha.41 h1:rLnwW/yYqtuonDB61U8KB/HXj0BMP4chzF0GLgJL+Uo=
+github.com/openimsdk/tools v0.0.49-alpha.28 h1:1CfdFxvKzyOIvgNMVMq4ZB2upAJ0evLbbigOhWQzhu8=
-github.com/openimsdk/tools v0.0.49-alpha.41/go.mod h1:zc0maZ2ohXlHd0ylY5JnCE8uqq/hslhcfcKa6iO5PCU=
+github.com/openimsdk/tools v0.0.49-alpha.28/go.mod h1:rwsFI1G/nBHNfiNapbven41akRDPBbH4df0Cgy6xueU=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

pkg/common/cmd/root.go

@@ -136,8 +136,11 @@ func (r *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
 		r.log.IsStdout,
 		r.log.IsJson,
 		r.log.StorageLocation,
-		r.log.RemainRotationCount,
 		r.log.RotationTime,
+		r.log.MaxBackups,
+		r.log.MaxSize,
+		r.log.MaxAge,
+		r.log.Compress,
 		config.Version,
 	)
 	if err != nil {

pkg/common/config/config.go

@@ -41,13 +41,16 @@ type LocalCache struct {
 }
 
 type Log struct {
-	StorageLocation     string `mapstructure:"storageLocation"`
+	StorageLocation string `mapstructure:"storageLocation"`
-	RotationTime        uint   `mapstructure:"rotationTime"`
+	RotationTime    uint   `mapstructure:"rotationTime"`
-	RemainRotationCount uint   `mapstructure:"remainRotationCount"`
+	RemainLogLevel  int    `mapstructure:"remainLogLevel"`
-	RemainLogLevel      int    `mapstructure:"remainLogLevel"`
+	MaxSize         int    `mapstructure:"maxSize"`
-	IsStdout            bool   `mapstructure:"isStdout"`
+	MaxBackups      int    `mapstructure:"maxBackups"`
-	IsJson              bool   `mapstructure:"isJson"`
+	MaxAge          int    `mapstructure:"maxAge"`
-	WithStack           bool   `mapstructure:"withStack"`
+	Compress        bool   `mapstructure:"compress"`
+	IsStdout        bool   `mapstructure:"isStdout"`
+	IsJson          bool   `mapstructure:"isJson"`
+	WithStack       bool   `mapstructure:"withStack"`
 }
 
 type Minio struct {
@@ -340,8 +343,8 @@ type BeforeConfig struct {
 }
 
 type AfterConfig struct {
-	Enable       bool  `mapstructure:"enable"`
+	Enable       bool     `mapstructure:"enable"`
-	Timeout      int   `mapstructure:"timeout"`
+	Timeout      int      `mapstructure:"timeout"`
 	AttentionIds []string `mapstructure:"attentionIds"`
 }