Fix 500 errors when requesting with an invalid or unknown monitor parameter

2024-07-21 04:31:42 -07:00
parent 79eea1d0f8
commit 397dd13c38
4 changed files with 23 additions and 106 deletions
--- a/server/history.go
+++ b/server/history.go
@@ -98,8 +98,11 @@ func (srv *Server) getHistoryParameters(ctx context.Context, c echo.Context) (hi
 			monitorParam = monitorParam + ".%"
 			monitor, err := q.GetMonitorByName(ctx, sql.NullString{Valid: true, String: monitorParam})
 			if err != nil {
+				if err == sql.ErrNoRows {
+					return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found").WithInternal(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 (sql)")
 			}
 			monitorID = monitor.ID