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

querylog: imp code

Browse Source
This commit is contained in:
Dimitry Kolyshev
2023-06-02 15:26:04 +03:00
parent 66d9ea7cca
commit c591e46254
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/querylog/csv.go
View File

@@ -9,9 +9,11 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
) )
// csvRow is an alias type for csv rows.
type csvRow = [18]string
// csvHeaderRow is a slice of strings with column names for CSV header row. // csvHeaderRow is a slice of strings with column names for CSV header row.
// This slice should correspond with [logEntry.toCSV] func. var csvHeaderRow = csvRow{
var csvHeaderRow = []string{
"ans_dnssec", "ans_dnssec",
"ans_rcode", "ans_rcode",
"ans_type", "ans_type",
@@ -34,7 +36,7 @@ var csvHeaderRow = []string{
// toCSV returns a slice of strings with entry fields according to the // toCSV returns a slice of strings with entry fields according to the
// csvHeaderRow slice. // csvHeaderRow slice.
func (e *logEntry) toCSV() (out []string) { func (e *logEntry) toCSV() (out csvRow) {
var filterID, filterRule string var filterID, filterRule string
if e.Result.IsFiltered && len(e.Result.Rules) > 0 { if e.Result.IsFiltered && len(e.Result.Rules) > 0 {
@@ -45,7 +47,7 @@ func (e *logEntry) toCSV() (out []string) {
aData := ansData(e) aData := ansData(e)
return []string{ return csvRow{
strconv.FormatBool(e.AuthenticatedData), strconv.FormatBool(e.AuthenticatedData),
aData.rCode, aData.rCode,
aData.typ, aData.typ,

5
internal/querylog/http.go
View File

@@ -125,7 +125,7 @@ func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request)
csvWriter := csv.NewWriter(w) csvWriter := csv.NewWriter(w)
// Write header. // Write header.
if err = csvWriter.Write(csvHeaderRow); err != nil { if err = csvWriter.Write(csvHeaderRow[:]); err != nil {
http.Error(w, "writing csv header", http.StatusInternalServerError) http.Error(w, "writing csv header", http.StatusInternalServerError)
return return
@@ -148,7 +148,8 @@ func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request)
params.offset += params.limit params.offset += params.limit
for _, entry := range entries { for _, entry := range entries {
if err = csvWriter.Write(entry.toCSV()); err != nil { row := entry.toCSV()
if err = csvWriter.Write(row[:]); err != nil {
// TODO(a.garipov): Set Trailer X-Error header. // TODO(a.garipov): Set Trailer X-Error header.
log.Error("%s %s %s: %s", r.Method, r.Host, r.URL, "writing csv record") log.Error("%s %s %s: %s", r.Method, r.Host, r.URL, "writing csv record")