mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-01-10 07:57:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

querylog: timeout

Browse source
This commit is contained in:
Dimitry Kolyshev 2023-06-13 14:36:31 +04:00
parent 86e25944b3
commit c43053e7d2
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
internal/querylog/http.go
View file

@ -99,14 +99,33 @@ func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
_ = aghhttp.WriteJSONResponse(w, r, resp) _ = aghhttp.WriteJSONResponse(w, r, resp)
} }
// exportChunkSize is a size of one search-flush iteration for query log export. const (
// exportChunkSize is a size of one search-flush iteration for query log
// export.
// //
// TODO(a.meshkov): Consider making configurable. // TODO(a.meshkov): Consider making configurable.
const exportChunkSize = 500 exportChunkSize = 500
// exportLogTimeout is a write timeout for query log export request.
//
// TODO(a.meshkov): Consider making configurable.
exportLogTimeout = 2 * time.Minute
)
// handleQueryLogExport is the handler for the GET /control/querylog/export // handleQueryLogExport is the handler for the GET /control/querylog/export
// HTTP API. // HTTP API.
func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request) { func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request) {
rc := http.NewResponseController(w)
// Set a deadline for this request. Note that it could be more than server
// write timeout.
err := rc.SetWriteDeadline(time.Now().Add(exportLogTimeout))
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "set timeout: %s", err)
return
}
searchCriteria, err := parseSearchCriteria(r.URL.Query()) searchCriteria, err := parseSearchCriteria(r.URL.Query())
if err != nil { if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "parsing params: %s", err) aghhttp.Error(r, w, http.StatusBadRequest, "parsing params: %s", err)
@ -151,7 +170,7 @@ func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request)
row := entry.toCSV() row := entry.toCSV()
if err = csvWriter.Write(row[:]); err != nil { 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: %s", r.Method, r.Host, r.URL, "writing csv record", err)
return return
} }
@ -162,7 +181,7 @@ func (l *queryLog) handleQueryLogExport(w http.ResponseWriter, r *http.Request)
if err = csvWriter.Error(); err != nil { if err = csvWriter.Error(); 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") log.Error("%s %s %s: %s: %s", r.Method, r.Host, r.URL, "writing csv", err)
} }
} }