This commit is contained in:
Thomas Miceli
2026-01-27 12:33:40 +07:00
parent 7a5c7c117f
commit 97bb9bd831

View File

@@ -2,13 +2,13 @@ package server
import ( import (
"errors" "errors"
"syscall"
"fmt" "fmt"
"html/template" "html/template"
"net/http" "net/http"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
"syscall"
"time" "time"
"github.com/labstack/echo-contrib/echoprometheus" "github.com/labstack/echo-contrib/echoprometheus"
@@ -92,7 +92,7 @@ func (s *Server) errorHandler(err error, ctx echo.Context) {
data["error"] = err data["error"] = err
if acceptJson { if acceptJson {
if err := ctx.JSON(httpErr.Code, httpErr); err != nil { if err := ctx.JSON(httpErr.Code, httpErr); err != nil {
if (errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET)) { if errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET) {
return return
} }
log.Fatal().Err(err).Send() log.Fatal().Err(err).Send()
@@ -101,7 +101,7 @@ func (s *Server) errorHandler(err error, ctx echo.Context) {
} }
if err := ctx.Render(httpErr.Code, "error", data); err != nil { if err := ctx.Render(httpErr.Code, "error", data); err != nil {
if (errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET)) { if errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET) {
return return
} }
log.Fatal().Err(err).Send() log.Fatal().Err(err).Send()
@@ -109,11 +109,14 @@ func (s *Server) errorHandler(err error, ctx echo.Context) {
return return
} }
if errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET) {
return
}
log.Error().Err(err).Send() log.Error().Err(err).Send()
httpErr = echo.NewHTTPError(http.StatusInternalServerError, err.Error()) httpErr = echo.NewHTTPError(http.StatusInternalServerError, err.Error())
data["error"] = httpErr data["error"] = httpErr
if err := ctx.Render(500, "error", data); err != nil { if err := ctx.Render(500, "error", data); err != nil {
if (errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET)) { if errors.Is(err, syscall.EPIPE) || errors.Is(err, syscall.ECONNRESET) {
return return
} }
log.Fatal().Err(err).Send() log.Fatal().Err(err).Send()