mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stats: imp code

This commit is contained in:
Stanislav Chzhen 2024-09-04 19:32:35 +03:00
parent bb3c0c8002
commit 022c90496a
1 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
internal/stats/http.go
View File

@ -72,13 +72,8 @@ func (s *StatsCtx) handleStats(w http.ResponseWriter, r *http.Request) {
if !ok { if !ok {
// Don't bring the message to the lower case since it's a part of UI // Don't bring the message to the lower case since it's a part of UI
// text for the moment. // text for the moment.
aghhttp.ErrorAndLog( const msg = "Couldn't get statistics data"
ctx, aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusInternalServerError, msg)
s.logger,
r,
w,
http.StatusInternalServerError, "Couldn't get statistics data",
)
return return
} }
@ -162,28 +157,13 @@ func (s *StatsCtx) handleStatsConfig(w http.ResponseWriter, r *http.Request) {
reqData := configResp{} reqData := configResp{}
err := json.NewDecoder(r.Body).Decode(&reqData) err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil { if err != nil {
aghhttp.ErrorAndLog( aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusBadRequest, "json decode: %s", err)
ctx,
s.logger,
r,
w,
http.StatusBadRequest,
"json decode: %s",
err,
)
return return
} }
if !checkInterval(reqData.IntervalDays) { if !checkInterval(reqData.IntervalDays) {
aghhttp.ErrorAndLog( aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusBadRequest, "Unsupported interval")
ctx,
s.logger,
r,
w,
http.StatusBadRequest,
"Unsupported interval",
)
return return
} }
@ -206,30 +186,14 @@ func (s *StatsCtx) handlePutStatsConfig(w http.ResponseWriter, r *http.Request)
reqData := getConfigResp{} reqData := getConfigResp{}
err := json.NewDecoder(r.Body).Decode(&reqData) err := json.NewDecoder(r.Body).Decode(&reqData)
if err != nil { if err != nil {
aghhttp.ErrorAndLog( aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusBadRequest, "json decode: %s", err)
ctx,
s.logger,
r,
w,
http.StatusBadRequest,
"json decode: %s",
err,
)
return return
} }
engine, err := aghnet.NewIgnoreEngine(reqData.Ignored) engine, err := aghnet.NewIgnoreEngine(reqData.Ignored)
if err != nil { if err != nil {
aghhttp.ErrorAndLog( aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusUnprocessableEntity, "ignored: %s", err)
ctx,
s.logger,
r,
w,
http.StatusUnprocessableEntity,
"ignored: %s",
err,
)
return return
} }
@ -251,14 +215,7 @@ func (s *StatsCtx) handlePutStatsConfig(w http.ResponseWriter, r *http.Request)
} }
if reqData.Enabled == aghalg.NBNull { if reqData.Enabled == aghalg.NBNull {
aghhttp.ErrorAndLog( aghhttp.ErrorAndLog(ctx, s.logger, r, w, http.StatusUnprocessableEntity, "enabled is null")
ctx,
s.logger,
r,
w,
http.StatusUnprocessableEntity,
"enabled is null",
)
return return
} }