Fix 500 errors when requesting with an invalid or unknown monitor parameter
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
@@ -102,6 +103,8 @@ func (srv *Server) Run() error {
|
||||
e := echo.New()
|
||||
srv.tpShutdown = append(srv.tpShutdown, e.Shutdown)
|
||||
|
||||
e.Debug = false
|
||||
|
||||
trustOptions := []echo.TrustOption{
|
||||
echo.TrustLoopback(true),
|
||||
echo.TrustLinkLocal(false),
|
||||
@@ -128,9 +131,13 @@ func (srv *Server) Run() error {
|
||||
Registerer: srv.metrics.Registry(),
|
||||
}))
|
||||
e.Use(otelecho.Middleware("data-api"))
|
||||
|
||||
e.Use(slogecho.NewWithConfig(log,
|
||||
slogecho.Config{
|
||||
WithTraceID: false, // done by logger already
|
||||
WithTraceID: false, // done by logger already
|
||||
DefaultLevel: slog.LevelInfo,
|
||||
ClientErrorLevel: slog.LevelWarn,
|
||||
ServerErrorLevel: slog.LevelError,
|
||||
// WithRequestHeader: true,
|
||||
},
|
||||
))
|
||||
|
||||
Reference in New Issue
Block a user