mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request: querylog: fix rotation 

Updates #3781.

Squashed commit of the following:

commit 43e76450b02f7ec54a1b23e5bb037685c2b89bbf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Oct 29 13:29:34 2021 +0300

    querylog: imp err handling, names

commit b53cfb9c29473e5e0753169e019be5b73d42361c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Oct 29 13:17:00 2021 +0300

    querylog: fix rotation
This commit is contained in:
Ainar Garipov 2021-10-29 13:43:08 +03:00
parent 1e52b309aa
commit 1e72960140
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/querylog/querylog.go
View File

@ -47,10 +47,10 @@ type Config struct {
// retention time is twice the interval. The value must be one of: // retention time is twice the interval. The value must be one of:
// //
// 6 * time.Hour // 6 * time.Hour
// 24 * time.Hour // 1 * timeutil.Day
// 7 * 24 * time.Hour // 7 * timeutil.Day
// 30 * 24 * time.Hour // 30 * timeutil.Day
// 90 * 24 * time.Hour // 90 * timeutil.Day
// //
RotationIvl time.Duration RotationIvl time.Duration
@ -123,7 +123,7 @@ func newQueryLog(conf Config) (l *queryLog) {
if !checkInterval(conf.RotationIvl) { if !checkInterval(conf.RotationIvl) {
log.Info( log.Info(
"querylog: warning: unsupported rotation interval %d, setting to 1 day", "querylog: warning: unsupported rotation interval %s, setting to 1 day",
conf.RotationIvl, conf.RotationIvl,
) )
l.conf.RotationIvl = timeutil.Day l.conf.RotationIvl = timeutil.Day

45
internal/querylog/querylogfile.go
View File

@ -3,6 +3,7 @@ package querylog
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"os" "os"
"time" "time"
@ -92,15 +93,15 @@ func (l *queryLog) rotate() error {
err := os.Rename(from, to) err := os.Rename(from, to)
if err != nil { if err != nil {
if errors.Is(err, os.ErrNotExist) { if errors.Is(err, os.ErrNotExist) {
log.Debug("querylog: no log to rotate")
return nil return nil
} }
log.Error("querylog: failed to rename file: %s", err) return fmt.Errorf("failed to rename old file: %w", err)
return err
} }
log.Debug("querylog: renamed %s -> %s", from, to) log.Debug("querylog: renamed %s into %s", from, to)
return nil return nil
} }
@ -135,22 +136,36 @@ func (l *queryLog) readFileFirstTimeValue() (first time.Time, err error) {
func (l *queryLog) periodicRotate() { func (l *queryLog) periodicRotate() {
defer log.OnPanic("querylog: rotating") defer log.OnPanic("querylog: rotating")
var err error rotations := time.NewTicker(1 * timeutil.Day)
for { defer rotations.Stop()
var oldest time.Time
oldest, err = l.readFileFirstTimeValue() for range rotations.C {
if err != nil { oldest, err := l.readFileFirstTimeValue()
log.Debug("%s", err) if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("querylog: reading oldest record for rotation: %s", err)
continue
}
rot := oldest.Add(l.conf.RotationIvl)
now := time.Now()
if rot.After(time.Now()) {
log.Debug(
"querylog: %s <= %s, not rotating",
now.Format(time.RFC3339),
rot.Format(time.RFC3339),
)
continue
} }
if oldest.Add(l.conf.RotationIvl).After(time.Now()) {
err = l.rotate() err = l.rotate()
if err != nil { if err != nil {
log.Debug("%s", err) log.Error("querylog: rotating: %s", err)
}
continue
} }
// What? log.Debug("querylog: rotated successfully")
time.Sleep(timeutil.Day)
} }
} }