diff --git a/client/config/constants.go b/client/config/constants.go index 8f6a931b840..33b8599b5ed 100644 --- a/client/config/constants.go +++ b/client/config/constants.go @@ -93,3 +93,14 @@ const ( // DefaultProbeInterval is the default interval of probing host. DefaultProbeInterval = 20 * time.Minute ) + +const ( + // DefaultLogRotateMaxSize is the default maximum size in megabytes of log files before rotation. + DefaultLogRotateMaxSize = 1024 + + // DefaultLogRotateMaxAge is the default number of days to retain old log files. + DefaultLogRotateMaxAge = 7 + + // DefaultLogRotateMaxBackups is the default number of old log files to keep. + DefaultLogRotateMaxBackups = 20 +) diff --git a/client/config/dfget_linux.go b/client/config/dfget_linux.go index 4f26b81f380..e6214936fa0 100644 --- a/client/config/dfget_linux.go +++ b/client/config/dfget_linux.go @@ -45,4 +45,7 @@ var dfgetConfig = ClientOption{ ShowProgress: false, Recursive: false, RecursiveLevel: 5, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, } diff --git a/client/config/peerhost_darwin.go b/client/config/peerhost_darwin.go index b82180900e1..849295585b6 100644 --- a/client/config/peerhost_darwin.go +++ b/client/config/peerhost_darwin.go @@ -186,5 +186,8 @@ var peerHostConfig = func() *DaemonOption { Interval: DefaultProbeInterval, }, }, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, } } diff --git a/client/config/peerhost_linux.go b/client/config/peerhost_linux.go index 4d3e8084ed7..3c2bedb0d76 100644 --- a/client/config/peerhost_linux.go +++ b/client/config/peerhost_linux.go @@ -186,5 +186,8 @@ var peerHostConfig = func() *DaemonOption { Interval: DefaultProbeInterval, }, }, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, } } diff --git a/internal/dflog/logcore.go b/internal/dflog/logcore.go index fd53cee2441..e9371409f6a 100644 --- a/internal/dflog/logcore.go +++ b/internal/dflog/logcore.go @@ -43,12 +43,6 @@ var ( KeepAliveLogFileName = "keepalive.log" ) -const ( - defaultRotateMaxSize = 1024 - defaultRotateMaxBackups = 20 - defaultRotateMaxAge = 7 -) - const ( encodeTimeFormat = "2006-01-02 15:04:05.000" ) @@ -60,26 +54,11 @@ var customGrpcLevel atomic.Bool func CreateLogger(filePath string, compress bool, stats bool, verbose bool, config LogRotateConfig) (*zap.Logger, zap.AtomicLevel, error) { - maxSize := defaultRotateMaxSize - if config.MaxSize > 0 { - maxSize = config.MaxSize - } - - maxAge := defaultRotateMaxAge - if config.MaxAge > 0 { - maxAge = config.MaxAge - } - - maxBackups := defaultRotateMaxBackups - if config.MaxBackups > 0 { - maxBackups = config.MaxBackups - } - rotateConfig := &lumberjack.Logger{ Filename: filePath, - MaxSize: maxSize, - MaxAge: maxAge, - MaxBackups: maxBackups, + MaxSize: config.MaxSize, + MaxAge: config.MaxAge, + MaxBackups: config.MaxBackups, LocalTime: true, Compress: compress, } diff --git a/manager/config/config.go b/manager/config/config.go index 508e64a582b..5c5e300d48b 100644 --- a/manager/config/config.go +++ b/manager/config/config.go @@ -406,6 +406,9 @@ func New() *Config { REST: RESTConfig{ Addr: DefaultRESTAddr, }, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, }, Auth: AuthConfig{ JWT: JWTConfig{ diff --git a/manager/config/constants.go b/manager/config/constants.go index 7b636dc8dd0..75e6ad8e0a7 100644 --- a/manager/config/constants.go +++ b/manager/config/constants.go @@ -122,6 +122,17 @@ const ( DefaultMetricsAddr = ":8000" ) +const ( + // DefaultLogRotateMaxSize is the default maximum size in megabytes of log files before rotation. + DefaultLogRotateMaxSize = 1024 + + // DefaultLogRotateMaxAge is the default number of days to retain old log files. + DefaultLogRotateMaxAge = 7 + + // DefaultLogRotateMaxBackups is the default number of old log files to keep. + DefaultLogRotateMaxBackups = 20 +) + var ( // DefaultCertIPAddresses is default ip addresses of certificate. DefaultCertIPAddresses = []net.IP{ip.IPv4, ip.IPv6} diff --git a/scheduler/config/config.go b/scheduler/config/config.go index 29b8a4a01b0..38358a4e24d 100644 --- a/scheduler/config/config.go +++ b/scheduler/config/config.go @@ -387,6 +387,9 @@ func New() *Config { Port: DefaultServerPort, AdvertisePort: DefaultServerAdvertisePort, Host: fqdn.FQDNHostname, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, }, Scheduler: SchedulerConfig{ Algorithm: DefaultSchedulerAlgorithm, diff --git a/scheduler/config/constants.go b/scheduler/config/constants.go index 2d3449f6de4..95b93291b3d 100644 --- a/scheduler/config/constants.go +++ b/scheduler/config/constants.go @@ -200,3 +200,14 @@ const ( // DefaultTrainerUploadTimeout is the default timeout of uploading dataset to trainer. DefaultTrainerUploadTimeout = 1 * time.Hour ) + +const ( + // DefaultLogRotateMaxSize is the default maximum size in megabytes of log files before rotation. + DefaultLogRotateMaxSize = 1024 + + // DefaultLogRotateMaxAge is the default number of days to retain old log files. + DefaultLogRotateMaxAge = 7 + + // DefaultLogRotateMaxBackups is the default number of old log files to keep. + DefaultLogRotateMaxBackups = 20 +) diff --git a/trainer/config/config.go b/trainer/config/config.go index ad1bf9e2b7e..12411544dda 100644 --- a/trainer/config/config.go +++ b/trainer/config/config.go @@ -136,6 +136,9 @@ func New() *Config { Server: ServerConfig{ AdvertisePort: DefaultServerAdvertisePort, Port: DefaultServerPort, + LogMaxSize: DefaultLogRotateMaxSize, + LogMaxAge: DefaultLogRotateMaxAge, + LogMaxBackups: DefaultLogRotateMaxBackups, }, Metrics: MetricsConfig{ Enable: false, diff --git a/trainer/config/constants.go b/trainer/config/constants.go index de8e6672e11..b6c51243636 100644 --- a/trainer/config/constants.go +++ b/trainer/config/constants.go @@ -51,3 +51,14 @@ var ( // DefaultNetworkEnableIPv6 is default value of enableIPv6. DefaultNetworkEnableIPv6 = false ) + +const ( + // DefaultLogRotateMaxSize is the default maximum size in megabytes of log files before rotation. + DefaultLogRotateMaxSize = 1024 + + // DefaultLogRotateMaxAge is the default number of days to retain old log files. + DefaultLogRotateMaxAge = 7 + + // DefaultLogRotateMaxBackups is the default number of old log files to keep. + DefaultLogRotateMaxBackups = 20 +)