Pull request 2339: upd-deps

Merge in DNS/adguard-home from upd-deps to master

Squashed commit of the following:

commit 40d509625c0099c34e6ff14f69b0ab1535b9c51f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 7 13:19:24 2025 +0300

    all: upd go, deps
This commit is contained in:
Ainar Garipov
2025-02-07 13:49:29 +03:00
parent d3dea0f46c
commit b92a3cfb89
11 changed files with 199 additions and 181 deletions

View File

@@ -20,6 +20,7 @@ import (
"github.com/AdguardTeam/golibs/logutil/slogutil"
"github.com/AdguardTeam/golibs/timeutil"
"go.etcd.io/bbolt"
bbolterrors "go.etcd.io/bbolt/errors"
)
// checkInterval returns true if days is valid to be used as statistics
@@ -469,7 +470,7 @@ func (s *StatsCtx) flushDB(id, limit uint32, ptr *unit) (cont bool, sleepFor tim
// TODO(e.burkov): Improve the algorithm of deleting the oldest bucket
// to avoid the error.
lvl := slog.LevelDebug
if !errors.Is(delErr, bbolt.ErrBucketNotFound) {
if !errors.Is(delErr, bbolterrors.ErrBucketNotFound) {
isCommitable = false
lvl = slog.LevelError
}