40614d9a7b
Merge in DNS/adguard-home from 2324-querylog-bug-fix to master
Closes #2324.
Squashed commit of the following:
commit fdd584a218e1edc3e45ab5b00ceed0a3be681e32
Merge: 8103f9e42 f2eda6d19
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 15:35:42 2020 +0300
Merge branch 'master' into 2324-querylog-bug-fix
commit 8103f9e42a398f43682ee30d09b3afdab0e9e177
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 14:28:29 2020 +0300
querylog: fix the file ordering bug
commit 2c4e8fcc5b8593be1614480508dfd600fc676e64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 20:57:45 2020 +0300
querylog: wrap errors to clarify error trace
commit 3733062b494817696e4443f153774bb01cea1b06
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 18:55:17 2020 +0300
querylog: fix logger output bug
145 lines
3.5 KiB
Go
145 lines
3.5 KiB
Go
package querylog
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
|
|
)
|
|
|
|
// QLogReader allows reading from multiple query log files in the reverse order.
|
|
//
|
|
// Please note that this is a stateful object.
|
|
// Internally, it contains a pointer to a particular query log file, and
|
|
// to a specific position in this file, and it reads lines in reverse order
|
|
// starting from that position.
|
|
type QLogReader struct {
|
|
// qFiles - array with the query log files
|
|
// The order is - from oldest to newest
|
|
qFiles []*QLogFile
|
|
|
|
currentFile int // Index of the current file
|
|
}
|
|
|
|
// NewQLogReader initializes a QLogReader instance
|
|
// with the specified files
|
|
func NewQLogReader(files []string) (*QLogReader, error) {
|
|
qFiles := make([]*QLogFile, 0)
|
|
|
|
for _, f := range files {
|
|
q, err := NewQLogFile(f)
|
|
if err != nil {
|
|
// Close what we've already opened
|
|
_ = closeQFiles(qFiles)
|
|
return nil, err
|
|
}
|
|
|
|
qFiles = append(qFiles, q)
|
|
}
|
|
|
|
return &QLogReader{
|
|
qFiles: qFiles,
|
|
currentFile: (len(qFiles) - 1),
|
|
}, nil
|
|
}
|
|
|
|
// Seek performs binary search of a query log record with the specified timestamp.
|
|
// If the record is found, it sets QLogReader's position to point to that line,
|
|
// so that the next ReadNext call returned this line.
|
|
//
|
|
// Returns nil if the record is successfully found.
|
|
// Returns an error if for some reason we could not find a record with the specified timestamp.
|
|
func (r *QLogReader) Seek(timestamp int64) (err error) {
|
|
for i, q := range r.qFiles {
|
|
_, _, err = q.Seek(timestamp)
|
|
if err == nil {
|
|
// Search is finished, and the searched element have
|
|
// been found. Update currentFile only, position is
|
|
// already set properly in QLogFile.
|
|
r.currentFile = i
|
|
return err
|
|
}
|
|
if errors.Is(err, ErrSeekNotFound) {
|
|
break
|
|
}
|
|
}
|
|
|
|
return fmt.Errorf("querylog: %w", err)
|
|
}
|
|
|
|
// SeekStart changes the current position to the end of the newest file
|
|
// Please note that we're reading query log in the reverse order
|
|
// and that's why log start is actually the end of file
|
|
//
|
|
// Returns nil if we were able to change the current position.
|
|
// Returns error in any other case.
|
|
func (r *QLogReader) SeekStart() error {
|
|
if len(r.qFiles) == 0 {
|
|
return nil
|
|
}
|
|
|
|
r.currentFile = len(r.qFiles) - 1
|
|
_, err := r.qFiles[r.currentFile].SeekStart()
|
|
return err
|
|
}
|
|
|
|
// ReadNext reads the next line (in the reverse order) from the query log files.
|
|
// and shifts the current position left to the next (actually prev) line (or the next file).
|
|
// returns io.EOF if there's nothing to read more.
|
|
func (r *QLogReader) ReadNext() (string, error) {
|
|
if len(r.qFiles) == 0 {
|
|
return "", io.EOF
|
|
}
|
|
|
|
for r.currentFile >= 0 {
|
|
q := r.qFiles[r.currentFile]
|
|
line, err := q.ReadNext()
|
|
if err != nil {
|
|
// Shift to the older file
|
|
r.currentFile--
|
|
if r.currentFile < 0 {
|
|
break
|
|
}
|
|
|
|
q = r.qFiles[r.currentFile]
|
|
|
|
// Set it's position to the start right away
|
|
_, err = q.SeekStart()
|
|
|
|
// This is unexpected, return an error right away
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
} else {
|
|
return line, nil
|
|
}
|
|
}
|
|
|
|
// Nothing to read anymore
|
|
return "", io.EOF
|
|
}
|
|
|
|
// Close closes the QLogReader
|
|
func (r *QLogReader) Close() error {
|
|
return closeQFiles(r.qFiles)
|
|
}
|
|
|
|
// closeQFiles - helper method to close multiple QLogFile instances
|
|
func closeQFiles(qFiles []*QLogFile) error {
|
|
var errs []error
|
|
|
|
for _, q := range qFiles {
|
|
err := q.Close()
|
|
if err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
}
|
|
|
|
if len(errs) > 0 {
|
|
return agherr.Many("Error while closing QLogReader", errs...)
|
|
}
|
|
|
|
return nil
|
|
}
|