Skip to content

fix: the file size inconsistencies after log files were rotated and compressed by size #4981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: the file size inconsistencies after log files were rotated and compressed by size #4981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions core/logx/rotatelogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type (
BackupFileName() string
MarkRotated()
OutdatedFiles() []string
ShallRotate(size int64) bool
ShallRotate(size, currentSize int64) (bool, int64)
}

// A RotateLogger is a Logger that can rotate log files with given rules.
Expand Down Expand Up @@ -135,8 +135,8 @@ func (r *DailyRotateRule) OutdatedFiles() []string {
}

// ShallRotate checks if the file should be rotated.
func (r *DailyRotateRule) ShallRotate(_ int64) bool {
return len(r.rotatedTime) > 0 && getNowDate() != r.rotatedTime
func (r *DailyRotateRule) ShallRotate(_, _ int64) (bool, int64) {
return len(r.rotatedTime) > 0 && getNowDate() != r.rotatedTime, 0
}

// NewSizeLimitRotateRule returns the rotation rule with size limit
Expand Down Expand Up @@ -218,8 +218,8 @@ func (r *SizeLimitRotateRule) OutdatedFiles() []string {
return result
}

func (r *SizeLimitRotateRule) ShallRotate(size int64) bool {
return r.maxSize > 0 && r.maxSize < size
func (r *SizeLimitRotateRule) ShallRotate(size, currentSize int64) (bool, int64) {
return r.maxSize > 0 && r.maxSize < size, r.maxSize - currentSize
}

func (r *SizeLimitRotateRule) parseFilename() (prefix, ext string) {
Expand Down Expand Up @@ -399,7 +399,17 @@ func (l *RotateLogger) startWorker() {
}

func (l *RotateLogger) write(v []byte) {
if l.rule.ShallRotate(l.currentSize + int64(len(v))) {

for {
isRotate, freeSize := l.rule.ShallRotate(l.currentSize+int64(len(v)), l.currentSize)
if !isRotate {
break
}
if l.fp != nil {
l.fp.Write(v[:freeSize])
l.currentSize += int64(len(v[:freeSize+1]))
v = v[freeSize:]
}
if err := l.rotate(); err != nil {
log.Println(err)
} else {
Expand Down
12 changes: 8 additions & 4 deletions core/logx/rotatelogger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ func TestDailyRotateRuleOutdatedFiles(t *testing.T) {
func TestDailyRotateRuleShallRotate(t *testing.T) {
var rule DailyRotateRule
rule.rotatedTime = time.Now().Add(time.Hour * 24).Format(time.DateOnly)
assert.True(t, rule.ShallRotate(0))
i, _ := rule.ShallRotate(0, 0)
assert.True(t, i)
}

func TestSizeLimitRotateRuleMarkRotated(t *testing.T) {
Expand Down Expand Up @@ -179,10 +180,13 @@ func TestSizeLimitRotateRuleShallRotate(t *testing.T) {
var rule SizeLimitRotateRule
rule.rotatedTime = time.Now().Add(time.Hour * 24).Format(fileTimeFormat)
rule.maxSize = 0
assert.False(t, rule.ShallRotate(0))
i, _ := rule.ShallRotate(0, 0)
assert.False(t, i)
rule.maxSize = 100
assert.False(t, rule.ShallRotate(0))
assert.True(t, rule.ShallRotate(101*megaBytes))
i, _ = rule.ShallRotate(0, 0)
assert.False(t, i)
i, _ = rule.ShallRotate(101*megaBytes, 0)
assert.True(t, i)
}

func TestRotateLoggerClose(t *testing.T) {
Expand Down