daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2292: 7338-stats-log-msg

Browse Source 
Updates #7338.

Squashed commit of the following:

commit a3ff2af22113d5d31f29f6626fb5b1897ca0d7b3
Merge: 9558de14e 5b45f6d50
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 14 17:48:26 2024 +0300

    Merge branch 'master' into 7338-stats-log-msg

commit 9558de14ef7786cd37481fd13975b3c469c98083
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 14 14:11:13 2024 +0300

    all: imp stats log msg
This commit is contained in:
Stanislav Chzhen
2024-10-14 18:14:09 +03:00
parent 5b45f6d508
commit 41cce62597
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -31,6 +31,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Fixed ### Fixed
- Repetitive statistics log messages ([#7338]).
- Custom client cache ([#7250]). - Custom client cache ([#7250]).
- Missing runtime clients with information from the system hosts file on first - Missing runtime clients with information from the system hosts file on first
AdGuard Home start ([#7315]). AdGuard Home start ([#7315]).
@@ -38,6 +39,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6818]: https://github.com/AdguardTeam/AdGuardHome/issues/6818 [#6818]: https://github.com/AdguardTeam/AdGuardHome/issues/6818
[#7250]: https://github.com/AdguardTeam/AdGuardHome/issues/7250 [#7250]: https://github.com/AdguardTeam/AdGuardHome/issues/7250
[#7315]: https://github.com/AdguardTeam/AdGuardHome/issues/7315 [#7315]: https://github.com/AdguardTeam/AdGuardHome/issues/7315
[#7338]: https://github.com/AdguardTeam/AdGuardHome/issues/7338
<!-- <!--
NOTE: Add new changes ABOVE THIS COMMENT. NOTE: Add new changes ABOVE THIS COMMENT.

2
internal/stats/stats.go
View File

@@ -467,7 +467,7 @@ func (s *StatsCtx) flushDB(id, limit uint32, ptr *unit) (cont bool, sleepFor tim
if delErr != nil { if delErr != nil {
// TODO(e.burkov): Improve the algorithm of deleting the oldest bucket // TODO(e.burkov): Improve the algorithm of deleting the oldest bucket
// to avoid the error. // to avoid the error.
lvl := slog.LevelWarn lvl := slog.LevelDebug
if !errors.Is(delErr, bbolt.ErrBucketNotFound) { if !errors.Is(delErr, bbolt.ErrBucketNotFound) {
isCommitable = false isCommitable = false
lvl = slog.LevelError lvl = slog.LevelError