Pull request 1962: upd-code-deps

Squashed commit of the following:

commit 7a24cf8f9c5515f642cbfc7e730b95005eeab11d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 15 14:54:16 2023 +0300

    all: upd code, deps, tools
This commit is contained in:
Ainar Garipov
2023-08-15 15:09:08 +03:00
parent 887c48cee8
commit 05262d7b6b
19 changed files with 103 additions and 148 deletions

View File

@@ -151,19 +151,15 @@ func (r *qLogReader) Close() error {
}
// closeQFiles is a helper method to close multiple qLogFile instances.
func closeQFiles(qFiles []*qLogFile) error {
func closeQFiles(qFiles []*qLogFile) (err error) {
var errs []error
for _, q := range qFiles {
err := q.Close()
err = q.Close()
if err != nil {
errs = append(errs, err)
}
}
if len(errs) > 0 {
return errors.List("error while closing qLogReader", errs...)
}
return nil
return errors.Annotate(errors.Join(errs...), "closing qLogReader: %w")
}