ntppool/data-api
Private
Public Access
1
0
Fork 0
Code Activity

scores: improve error handling for invalid monitor parameters
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Ask Bjørn Hansen
2024-07-20 00:29:36 -07:00
parent 8dfd7c8a4e
commit 79eea1d0f8
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/history.go
View File

@@ -98,7 +98,7 @@ func (srv *Server) getHistoryParameters(ctx context.Context, c echo.Context) (hi
monitorParam = monitorParam + ".%" monitorParam = monitorParam + ".%"
monitor, err := q.GetMonitorByName(ctx, sql.NullString{Valid: true, String: monitorParam}) monitor, err := q.GetMonitorByName(ctx, sql.NullString{Valid: true, String: monitorParam})
if err != nil { if err != nil {
log.Warn("could not find monitor", "name", monitorParam, "err", err) log.WarnContext(ctx, "could not find monitor", "name", monitorParam, "err", err)
return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found") return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found")
} }
monitorID = monitor.ID monitorID = monitor.ID
@@ -152,14 +152,20 @@ func (srv *Server) history(c echo.Context) error {
p, err := srv.getHistoryParameters(ctx, c) p, err := srv.getHistoryParameters(ctx, c)
if err != nil { if err != nil {
log.Error("get history parameters", "err", err) if he, ok := err.(*echo.HTTPError); ok {
return he
}
log.ErrorContext(ctx, "get history parameters", "err", err)
span.RecordError(err) span.RecordError(err)
return echo.NewHTTPError(http.StatusInternalServerError, "internal error") return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
} }
server, err := srv.FindServer(ctx, c.Param("server")) server, err := srv.FindServer(ctx, c.Param("server"))
if err != nil { if err != nil {
log.Error("find server", "err", err) log.ErrorContext(ctx, "find server", "err", err)
if he, ok := err.(*echo.HTTPError); ok {
return he
}
span.RecordError(err) span.RecordError(err)
return echo.NewHTTPError(http.StatusInternalServerError, "internal error") return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
} }